Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,868 Commits 2 Branches 1 Tag
1c9a8bd42ed4e714e2864fa1b313cd19ec5a3f32
Commit Graph
1868 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
liuzhaotian 70e410cb6f 生产工序代码-错误枚举修改 2024-04-28 09:25:58 +08:00
刘照田 a8380bba60 Merge branch 'LiuZt' into 'main' 
生产工序代码提交

See merge request cf_devdept2/cf_imes_server!2
 2024-04-26 18:47:12 +08:00
yangsb c0084dbc4b 处理token过期导致数据源标识异常 2024-04-26 17:04:20 +08:00
刘照田 b0b1b58821 Merge branch 'main' into 'LiuZt' 
# Conflicts:
#   cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
#   cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupService.java
#   cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java
 2024-04-26 09:03:38 +00:00
liuzhaotian 7db670ad0d 生产工序代码 2024-04-26 16:52:47 +08:00
yangsb 522108aaa8 优化获取是否管理员自动的方式，去除登出接口组织id依赖 2024-04-26 15:25:03 +08:00
yangsb 0fb3bca338 修改es索引创建人、修改人字段类型 2024-04-26 14:18:12 +08:00
yangsb 4186fd6cff 处理单元测试代码编译失败 2024-04-26 13:45:39 +08:00
yangsb c911cb444a 处理新增用户的异常 2024-04-26 11:23:16 +08:00
yangsb 83ca67a2df token中添加大型组织参数 2024-04-26 10:22:32 +08:00
yangsb b3c1cf89fc 处理网关header传递中文异常 2024-04-26 10:13:01 +08:00
lym f12ef9e9eb Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-25 19:37:51 +08:00
lym cde7b0269b bug修改 2024-04-25 19:37:43 +08:00
yangsb a7eff5f294 修改mybatis自动插入的creator updater 字段为用户昵称 2024-04-25 17:45:18 +08:00
yangsb b73028b192 组织分页添加套餐名称字段 2024-04-25 15:48:03 +08:00
lym 6caedb1e81 bug修改 2024-04-25 14:51:52 +08:00
lym c7b2c28aa2 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-25 14:47:06 +08:00
lym cc00b46d9a bug修改 2024-04-25 14:46:59 +08:00
yangsb 2153f13a71 处理机台模板权限 2024-04-25 14:46:33 +08:00
yangsb fa5e72328c header 2024-04-25 14:31:18 +08:00
yangsb c360572f5a 处理网关传递header异常 2024-04-25 14:30:45 +08:00
yangsb 992f073d12 用户赋角色、角色配用户添加组织id参数，添加根据角色id查询用户列表接口 2024-04-25 11:40:51 +08:00
lym aa7144a090 bug修改 2024-04-25 11:12:49 +08:00
lym 316d021980 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-25 11:09:48 +08:00
lym 82e388372c bug修改 2024-04-25 11:09:39 +08:00
yangsb 9d2baef834 修改部门负责人字段，添加组织备注字段 2024-04-25 09:27:56 +08:00
yangsb a2e05e7112 修复部分bug 2024-04-25 09:04:35 +08:00
lym a1cbfbfaef bug修改 2024-04-24 19:39:44 +08:00
lym 4430543d06 Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-24 19:28:29 +08:00
lym 53937f842b bug修改 2024-04-24 19:28:21 +08:00
yangsb 918af33951 修复角色新增状态问题 2024-04-24 10:54:01 +08:00
yangsb 2499774419 角色 新增、修改添加状态参数 2024-04-24 10:46:23 +08:00
yangsb 2aedb872d1 修复部分bug 2024-04-24 10:04:14 +08:00
yangsb a8bad07079 去除组织员工角色分配用户限制 2024-04-23 16:52:20 +08:00
yangsb 2bd039c9d9 添加限制本人分配用户角色、设置菜单权限 2024-04-23 15:02:58 +08:00
yangsb c26fabb760 处理权限异常 2024-04-22 14:42:59 +08:00
liuzhaotian ff14836e10 语音播报，动态配置，定时任务，工序代码修改 2024-04-20 16:41:51 +08:00
lym 49f9cb9de5 板材接口修改 2024-04-19 18:57:27 +08:00
lym af59e4d830 板材接口修改 2024-04-19 18:27:55 +08:00
lym 836c9358e3 板材接口修改 2024-04-19 17:40:36 +08:00
lym 7b1306342f Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server 2024-04-19 17:35:12 +08:00
lym 4cac05a412 板材接口修改 2024-04-19 17:35:04 +08:00
yangsb 5c8075404e 处理角色权限分配异常 2024-04-19 17:33:08 +08:00
yangsb 7b0290a038 添加限制 2024-04-19 16:24:30 +08:00
yangsb 9e6b9df28e 处理权限 2024-04-19 16:08:39 +08:00
yangsb 2b97986b56 Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server 2024-04-19 14:11:43 +08:00
yangsb 50d5befffb 去除前端heard organ-id依赖 2024-04-19 14:11:27 +08:00
lym 3af6472ada 板材工序接口修改 2024-04-19 14:08:50 +08:00
yangsb 5ff48fa2ed 去除前端传递organ-id依赖 2024-04-19 11:56:28 +08:00
yangsb 29be924b51 处理创建组织时候，用户数量限制参数异常 2024-04-19 09:23:10 +08:00