Commit Graph

701 Commits

Author SHA1 Message Date
dxfeng 9992e807b4 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-08-02 16:25:51 +08:00
reset 9bad53c5aa
!177 非标开关
Merge pull request !177 from reset/feature/cl
2022-08-02 08:25:31 +00:00
dxfeng 0e3fc1a238 同步CusFieldData数据接口 2022-08-02 16:25:21 +08:00
Chengliang b5fd59db2b fix 2022-08-02 16:24:24 +08:00
Chengliang 665a4a0394 非标开关 2022-08-02 16:21:05 +08:00
dxfeng 8ce35f1c6d
!176 编制方案需求完善
Merge pull request !176 from dxfeng/feature/dxf
2022-08-02 07:11:38 +00:00
dxfeng ceb3484d6d 编制方案需求完善 2022-08-02 15:10:36 +08:00
dxfeng 1c9b1abe69 编制方案需求完善 2022-08-02 14:42:25 +08:00
dxfeng 40a38d76e6 编制方案需求完善 2022-08-02 13:55:30 +08:00
dxfeng 7b88ba5a78 编制方案需求完善 2022-08-02 13:39:47 +08:00
dxfeng 27e0473a83
!175 BUG修复
Merge pull request !175 from dxfeng/feature/dxf
2022-08-01 10:35:35 +00:00
dxfeng 6c91c3d41d BUG修复 2022-08-01 18:34:20 +08:00
dxfeng 5a9a64f93a
!174 人员导入、CusFieldData触发器调整
Merge pull request !174 from dxfeng/feature/dxf
2022-08-01 09:05:31 +00:00
dxfeng 46ab51ee18 人员导入、CusFieldData触发器调整 2022-08-01 17:03:13 +08:00
Chengliang 4ac0c27950 fixed 2022-08-01 10:27:00 +08:00
dxfeng fefd80c5f2
!173 BUG修复
Merge pull request !173 from dxfeng/feature/dxf
2022-08-01 01:10:18 +00:00
dxfeng ceba6b5d62 BUG修复 2022-08-01 09:09:39 +08:00
dxfeng 14f422c9a4
!172 人员导入
Merge pull request !172 from dxfeng/feature/dxf
2022-07-29 08:22:43 +00:00
dxfeng 0a47b3548d 人员导入 2022-07-29 16:20:59 +08:00
dxfeng 72e1604ed8
!171 岗位导入
Merge pull request !171 from dxfeng/feature/dxf
2022-07-27 08:48:56 +00:00
dxfeng d5447c8e59 岗位导入 2022-07-27 16:47:19 +08:00
dxfeng bc151f7648 部门导入 2022-07-27 11:41:30 +08:00
dxfeng a36ffd95cd
!169 部门导入
Merge pull request !169 from dxfeng/feature/dxf
2022-07-27 02:49:48 +00:00
dxfeng fc8aaf7729 部门导入、日志记录 2022-07-27 10:48:43 +08:00
dxfeng 5d9a8dbf2c
!168 分部导入、日志记录
Merge pull request !168 from dxfeng/feature/dxf
2022-07-27 01:23:31 +00:00
dxfeng c23127acc2 分部导入、日志记录 2022-07-27 09:22:15 +08:00
dxfeng bf57cb792d
!167 分部导入
Merge pull request !167 from dxfeng/feature/dxf
2022-07-26 08:34:40 +00:00
dxfeng b1365da225 分部导入 2022-07-26 16:33:41 +08:00
dxfeng 334b1969f5
!166 分部导入
Merge pull request !166 from dxfeng/feature/dxf
2022-07-26 02:25:46 +00:00
dxfeng 79d79575da 分部导入 2022-07-26 10:24:59 +08:00
dxfeng 88c646272d
!165 分部导入
Merge pull request !165 from dxfeng/feature/dxf
2022-07-26 02:16:34 +00:00
dxfeng 3356a7388e 分部导入 2022-07-26 10:15:01 +08:00
dxfeng e0e838d73b
!164 分部导入
Merge pull request !164 from dxfeng/feature/dxf
2022-07-26 01:41:34 +00:00
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