Commit Graph

129 Commits

Author SHA1 Message Date
reset 0c5e3cae8f
!44 需求优化
Merge pull request !44 from reset/feature/cl
2022-06-22 09:22:49 +00:00
Chengliang ebf1cb58d9 需求优化 2022-06-22 17:19:28 +08:00
liyongshun fda7c7c0d0 Merge branch 'dev' of https://gitee.com/jmlcl/trunk into dev 2022-06-22 16:09:56 +08:00
liyongshun 4878b6be1d 修改职务管理 2022-06-22 16:09:43 +08:00
reset c81ff2bca5
!43 需求统一优化处理
Merge pull request !43 from reset/feature/cl
2022-06-22 02:29:26 +00:00
Chengliang 4102c1e135 需求统一优化处理 2022-06-22 10:28:25 +08:00
reset 9fa6b9da32
!42 人员管理模块
Merge pull request !42 from reset/feature/cl
2022-06-21 10:42:37 +00:00
Chengliang 32a0c9cbd2 人员管理模块 2022-06-21 18:39:50 +08:00
Chengliang 74d5522239 人员管理 2022-06-20 17:08:10 +08:00
reset 5bd1d12a76
!40 v1.2
Merge pull request !40 from reset/feature/cl
2022-06-20 03:09:41 +00:00
Chengliang ed990bcfb2 完成v1.20 2022-06-20 11:08:19 +08:00
Chengliang 1dce448427 自定义设置页面初步完成 2022-06-17 18:06:07 +08:00
reset 860dd0212c
!39 自定义设置页面
Merge pull request !39 from reset/feature/cl
2022-06-16 10:36:23 +00:00
Chengliang 19e1d07e3c 自定义设置页面接口对接 2022-06-16 18:35:17 +08:00
Chengliang 2d1c756985 自定义页面树和tab接口对接 2022-06-16 08:43:36 +08:00
liyongshun 5be0bb68e6 编号设置合并 2022-06-15 13:17:33 +08:00
liyongshun a633a3a28c Merge branch 'liys_test' of gitee.com:jmlcl/trunk into dev 2022-06-15 11:21:50 +08:00
liyongshun 8f0306b95f 分支合并 2022-06-15 11:16:11 +08:00
liyongshun 2b1093ca1d 编号设置部分bug的修改 2022-06-15 11:02:24 +08:00
reset 34d7ab154a
!38 自定义设置合并
Merge pull request !38 from reset/test
2022-06-13 09:36:32 +00:00
Chengliang 88dd830ce3 自定义设置 2022-06-13 17:35:34 +08:00
Chengliang 1a35ec1bd5 自定义设置增加类型 2022-06-13 15:38:26 +08:00
Chengliang aa499d7855 自定义设置test 2022-06-10 17:51:55 +08:00
Chengliang 5bfb129380 自定义设置 2022-06-10 16:37:52 +08:00
liyongshun 938e17aaad 完成编号设置的功能 2022-06-09 16:51:37 +08:00
reset 6248c7d184
!37 岗位高级搜索bug修复
Merge pull request !37 from reset/feature/cl
2022-06-08 08:54:14 +00:00
Chengliang 74879c046d 岗位高级搜索bug修复 2022-06-08 16:51:54 +08:00
reset d724566384
!36 bug修复
Merge pull request !36 from reset/feature/cl
2022-06-08 06:13:28 +00:00
Chengliang faf37dba1d bug修复 2022-06-08 14:10:17 +08:00
liyongshun 88bf00cc8d 编号设置路径修改 2022-06-08 09:44:19 +08:00
liyongshun f50c8f2bde Merge branch 'dev' of gitee.com:jmlcl/trunk into dev 2022-06-07 18:14:46 +08:00
liyongshun cbaea8f2da 编号设置描述语修改 2022-06-07 18:14:39 +08:00
reset 76c5ceed96
!35 修改编制变更
Merge pull request !35 from reset/feature/cl
2022-06-07 10:13:11 +00:00
Chengliang 14b7080a28 修改编制变更 2022-06-07 18:11:10 +08:00
liyongshun dbc6134ccf Merge branch 'liys_dev' into dev 2022-06-07 18:10:06 +08:00
liyongshun 76051adc16 编号设置接口联调完成80% 2022-06-07 18:01:50 +08:00
reset d3f49f9be6
!33 编制补充
Merge pull request !33 from reset/feature/cl
2022-06-07 09:59:09 +00:00
Chengliang ce77261397 编制补充 2022-06-07 17:58:20 +08:00
Chengliang 79916567d5 编制修改 2022-06-07 17:56:29 +08:00
reset 58b99e41ff
!32 权限控制
Merge pull request !32 from reset/feature/cl
2022-06-07 08:53:33 +00:00
Chengliang 84b6f732c6 增加权限控制 2022-06-07 16:52:12 +08:00
reset cca368c495
!31 部门转移
Merge pull request !31 from reset/feature/cl
2022-06-07 01:35:22 +00:00
Chengliang 772f0b66ee 修复转移页面 2022-06-07 09:34:25 +08:00
reset 3b49f1e92e
!30 部门管理
Merge pull request !30 from reset/feature/cl
2022-06-06 08:50:59 +00:00
Chengliang 2b34890e6d 对接部门合并转移 复制 2022-06-06 16:48:19 +08:00
liyongshun 204613099a 部门编号设置 2022-06-06 14:01:41 +08:00
liyongshun f3877c843f Merge branch 'dev' into liys_dev 2022-06-04 21:50:09 +08:00
Chengliang aefcb9772b solve conflict 2022-06-02 17:06:47 +08:00
Chengliang f5afc77283 部门管理页面 2022-06-02 16:51:21 +08:00
Chengliang e2f8c060a6 check及操作按钮权限 2022-06-01 17:18:40 +08:00