Commit Graph

254 Commits

Author SHA1 Message Date
dxfeng c23127acc2 分部导入、日志记录 2022-07-27 09:22:15 +08:00
dxfeng b1365da225 分部导入 2022-07-26 16:33:41 +08:00
dxfeng 79d79575da 分部导入 2022-07-26 10:24:59 +08:00
dxfeng 3356a7388e 分部导入 2022-07-26 10:15:01 +08: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 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 3ed9ec2f99 岗位浏览按钮优化 2022-07-18 13:33:11 +08: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 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 b8adf9ab7b 岗位模块操作同步EC 2022-07-15 09:02:18 +08:00
dxfeng 15c9ef7e61 分部、部门 添加UUID列;部门表结构更新 2022-07-13 17:19:45 +08: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 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 b52bb93dfa 人员拓展卡片、分部更新EC 2022-07-12 16:38:27 +08:00
dxfeng 81fcd96af6 人员拓展卡片 2022-07-11 15:59:15 +08:00
MustangDen f4f222ba91 Merge branch 'feature/djp' into develop 2022-07-08 16:25:08 +08:00
MustangDen 7df8602e97 fix 组织架构sql问题 2022-07-08 16:24:30 +08:00
dxfeng 2bbf5367c6 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-08 14:08:11 +08:00
dxfeng d760367a95 记录操作日志 2022-07-08 14:07:55 +08:00
670124965@qq.com 58f3aedf9d Merge branch 'feature/djp' into develop 2022-07-08 11:38:16 +08:00
dxfeng 7103eb0c73 记录操作日志 2022-07-07 15:32:30 +08:00
Chengliang 0bdcc18c56 日期组合改造 2022-07-07 11:54:21 +08:00
MustangDeng b589056585 组织结构图接口 2022-07-07 10:14:25 +08:00
dxfeng 2702b175cd 记录操作日志 2022-07-06 15:43:16 +08:00
dxfeng cca52d7080 记录操作日志 2022-07-06 11:44:07 +08:00
dxfeng c139cd408a 记录操作日志 2022-07-06 10:15:26 +08:00
dxfeng 4f52218e89 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-05 18:47:26 +08:00
reset 9b1d7a26d3
!141 需求优化
Merge pull request !141 from reset/feature/cl
2022-07-05 10:46:50 +00:00
dxfeng bef63439b2 记录操作日志 2022-07-05 18:46:43 +08:00
Chengliang 6c304e8a81 需求优化 2022-07-05 18:45:40 +08:00
dxfeng 278194a4a3 记录操作日志,岗位优化 2022-07-05 18:44:45 +08:00
dxfeng f5d95fabb2 记录操作日志 2022-07-05 15:15:00 +08:00
dxfeng 618e30e6ef 操作日志 2022-07-05 09:42:09 +08:00
dxfeng 37142c3a3e Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/service/impl/DemoServiceImpl.java
2022-07-05 09:39:51 +08:00
dxfeng 033e90aa34 操作日志 2022-07-05 09:39:00 +08:00
Chengliang 46aeddea39 需求调整 2022-07-04 17:51:31 +08:00
Chengliang eec9446dcd 去除weaverboot引用 2022-07-04 14:24:20 +08:00