Commit Graph

340 Commits

Author SHA1 Message Date
Chengliang 44715650db 集团编辑功能完善 2022-05-18 15:24:46 +08:00
reset e7e1410cef
!6 1
Merge pull request !6 from reset/feature/cl
2022-05-18 07:02:09 +00:00
Chengliang b96ffa4205 solve conflict 2022-05-18 15:01:04 +08:00
reset 15e223269d
!5 solve conflict
Merge pull request !5 from reset/feature/cl
2022-05-18 06:59:48 +00:00
Chengliang db16ec323a solve conflict 2022-05-18 14:58:44 +08:00
reset c3d7a9db71
!4 1
Merge pull request !4 from reset/feature/cl
2022-05-18 06:56:09 +00:00
Chengliang a89634f0df 1 2022-05-18 14:55:10 +08:00
Chengliang 507ff9df6c solve conflct 2022-05-18 14:53:44 +08:00
Chengliang eff03741b2 solve conflict 2022-05-18 14:49:46 +08:00
Chengliang b073384fc7 solve conflict 2022-05-18 14:46:36 +08:00
Chengliang 98ae042c26 公司/发布列表页面 2022-05-18 14:34:01 +08:00
liyongshun 821c46bb9d Merge branch 'liys_dev' into dev 2022-05-18 14:15:34 +08:00
liyongshun 24f3350420 修改编号设置页面交互 2022-05-18 14:15:10 +08:00
liyongshun 81f9b5ca2f Merge branch 'liys_dev' into dev 2022-05-18 14:08:33 +08:00
liyongshun 9303fe3f3c 编号组成交互的完成 2022-05-18 13:49:24 +08:00
liyongshun e1cc281cff 分部编号设置的页面完成50% 2022-05-17 18:32:09 +08:00
reset e0432a21c5
!3 公司/分部扩展页面
Merge pull request !3 from reset/feature/cl
2022-05-17 06:49:34 +00:00
Chengliang dd9646213f 公司/发布扩展页面 2022-05-17 14:47:54 +08:00
liyongshun 89aab7a742 Merge branch 'dev' of gitee.com:jmlcl/trunk into dev 2022-05-17 14:11:59 +08:00
liyongshun 596816ebb2 删除测试文件 2022-05-17 14:11:56 +08:00
Chengliang 1bf9f9aa81 公司/分部扩展页面 2022-05-16 17:32:27 +08:00
liyongshun aaa31935b3 Merge branch 'dev' of gitee.com:jmlcl/trunk into dev 2022-05-16 17:13:39 +08:00
liyongshun 5bc2f44073 职务管理模块接口联调 2022-05-16 17:13:37 +08:00
Chengliang bb7bd102ec 公司/分部管理 2022-05-16 13:36:54 +08:00
Chengliang 774bd7203f 公司/分部管理初始化 2022-05-16 10:32:21 +08:00
liyongshun 559ed2cbee Merge branch 'dev' of gitee.com:jmlcl/trunk into dev 2022-05-13 18:09:32 +08:00
liyongshun 9e8d36bbc4 职务管理页面的新增 2022-05-13 18:06:15 +08:00
liyongshun 2e167f4099 职务管理页面新增 2022-05-13 18:05:45 +08:00
Chengliang 811c9da4d1 集团管理静态页面 2022-05-13 16:56:52 +08:00
Chengliang 67304df567 完成职等页面 职级页面 2022-05-12 14:57:36 +08:00
Chengliang 8c6d1df37c 等级方案页面完成 职等页面完成静态页面 2022-05-10 18:02:06 +08:00
Chengliang fb6ae67485 等级方案页面完成列表渲染,高级搜索,禁用标记等 2022-05-07 17:46:35 +08:00
Chengliang b7c99835da 等级方案页面 2022-05-06 16:53:43 +08:00
Chengliang a2fa127bfe 测试 2022-05-05 16:28:47 +08:00
Chengliang 6e255cca36 Merge branch 'master' of https://gitee.com/jmlcl/trunk into dev 2022-05-05 16:20:12 +08:00
Chengliang d66989e53c 修改说明文档 2022-05-05 16:11:51 +08:00
Chengliang 7f6a359013 初始化 2022-05-05 16:02:19 +08:00
Chengliang 0f54363ed3 初始化 2022-05-05 16:01:41 +08:00
Chengliang a645a95956 组织管理前端脚手架搭建 2022-05-05 15:57:07 +08:00
reset a248425e34
Initial commit 2022-05-05 07:52:35 +00:00