Commit Graph

618 Commits

Author SHA1 Message Date
dxfeng 9d304b0303 分部导入 2022-07-26 09:40:13 +08:00
dxfeng 5ccb12569a
!163 BUG 修复
Merge pull request !163 from dxfeng/feature/dxf
2022-07-25 01:08:21 +00:00
dxfeng b44539f62f BUG 修复 2022-07-25 09:04:15 +08:00
dxfeng 56a697d4e4 BUG 修复 2022-07-22 16:02:32 +08:00
MustangDeng 3e92e25520 Merge branch 'feature/djp' into develop 2022-07-21 13:49:54 +08:00
MustangDeng d950e1ae40 fix: fleader问题 2022-07-21 13:49:06 +08:00
MustangDeng cc318fa73c Merge branch 'feature/djp' into develop 2022-07-21 11:57:29 +08:00
MustangDeng 10a577d0c4 Merge remote-tracking branch 'origin/develop' into develop 2022-07-21 11:57:18 +08:00
MustangDeng ac490e1b8f fix: whereSql合并 2022-07-21 11:56:54 +08:00
MustangDeng 06ccafb464 fix: fnumber问题 2022-07-21 11:08:08 +08:00
MustangDeng 0a1e6c6e7d feature: 组织架构异步数据v1.0 2022-07-21 11:01:36 +08:00
dxfeng 5cf4e84800
!162 岗位浏览按钮优化
Merge pull request !162 from dxfeng/feature/dxf
2022-07-18 05:35:34 +00:00
dxfeng 3ed9ec2f99 岗位浏览按钮优化 2022-07-18 13:33:11 +08:00
dxfeng 8869a18977 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-18 13:27:36 +08:00
dxfeng fa663a1eaa 岗位浏览按钮优化 2022-07-18 13:27:15 +08:00
reset 02f06be32f
!159 浏览
Merge pull request !159 from reset/feature/cl
2022-07-18 01:42:47 +00:00
reset 71109c35ae Merge branch 'develop' of gitee.com:jmlcl/weaver-hrm-organization into feature/cl 2022-07-18 01:42:25 +00:00
Chengliang 09490fe867 浏览按钮 2022-07-15 17:13:02 +08:00
Chengliang f8835ffd95 默认职务sql 2022-07-15 17:13:02 +08:00
Chengliang cb274d6a6c 需求优化2 2022-07-15 17:13:02 +08:00
dxfeng 1db3f999f9 分部更新EC 2022-07-15 17:13:02 +08:00
dxfeng 92b2f54ddd 人员拓展卡片、分部更新EC 2022-07-15 17:13:02 +08:00
dxfeng 63336fa223
!161 初始化SQL提交
Merge pull request !161 from dxfeng/feature/dxf
2022-07-15 08:53:57 +00:00
dxfeng e22d5df6e6 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-15 16:50:15 +08:00
dxfeng 58e9f0ebb8 初始化SQL提交 2022-07-15 16:49:54 +08:00
dxfeng 8d9802a2ca
!160 岗位浏览按钮
Merge pull request !160 from dxfeng/feature/dxf
2022-07-15 06:44:51 +00:00
dxfeng 38aef63991 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-15 14:42:55 +08:00
dxfeng 3c74268126 岗位浏览按钮 2022-07-15 14:42:31 +08:00
dxfeng e59317a823
!158 岗位模块操作同步EC
Merge pull request !158 from dxfeng/feature/dxf
2022-07-15 01:03:52 +00:00
dxfeng b8adf9ab7b 岗位模块操作同步EC 2022-07-15 09:02:18 +08:00
dxfeng 80903cbbd1
!157 分部、部门 添加UUID列;部门表结构更新
Merge pull request !157 from dxfeng/feature/dxf
2022-07-13 09:20:49 +00:00
dxfeng d55697bf5c Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-13 17:20:06 +08:00
dxfeng 15c9ef7e61 分部、部门 添加UUID列;部门表结构更新 2022-07-13 17:19:45 +08:00
dxfeng fcb9761ae7 分部、部门 添加UUID列 2022-07-13 11:01:48 +08:00
dxfeng eaf8688acd
!156 分部更新EC
Merge pull request !156 from dxfeng/feature/dxf
2022-07-13 02:57:01 +00:00
dxfeng d72c68dec0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-13 10:56:04 +08:00
dxfeng e217ecbe16 分部更新EC 2022-07-13 10:55:44 +08:00
reset 98471b9756
!155 默认职务sql
Merge pull request !155 from reset/feature/cl
2022-07-13 02:23:17 +00:00
Chengliang 01ea1e8899 默认职务sql 2022-07-13 10:22:08 +08:00
reset 7f5568809c
!154 需求优化2
Merge pull request !154 from reset/feature/cl
2022-07-13 01:22:17 +00:00
Chengliang a1ed3e45c9 需求优化2 2022-07-13 09:20:21 +08:00
dxfeng 33151c57a4
!153 人员拓展卡片、分部更新EC
Merge pull request !153 from dxfeng/feature/dxf
2022-07-12 08:45:23 +00:00
dxfeng 3e9e3f59b6 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-12 16:44:21 +08:00
dxfeng b52bb93dfa 人员拓展卡片、分部更新EC 2022-07-12 16:38:27 +08:00
reset 65f47235b9
!152 生产合并
Merge pull request !152 from reset/develop
2022-07-12 01:20:15 +00:00
dxfeng 34dd115da1
!151 人员拓展卡片
Merge pull request !151 from dxfeng/feature/dxf
2022-07-11 07:59:49 +00:00
dxfeng 81fcd96af6 人员拓展卡片 2022-07-11 15:59:15 +08:00
dxfeng f19c20f6be
!150 BUG修复
Merge pull request !150 from dxfeng/feature/dxf
2022-07-11 02:49:18 +00:00
dxfeng 7ecd58d27b 删除webService 2022-07-11 10:01:43 +08:00
dxfeng 15a819a272 表结构更新 2022-07-11 09:14:02 +08:00