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
|
ed328996ea
|
!149 记录操作日志
Merge pull request !149 from dxfeng/feature/dxf
|
2022-07-07 09:30:51 +00:00 |
|
dxfeng
|
2175d7ca6a
|
记录操作日志
|
2022-07-07 17:30:32 +08:00 |
|
dxfeng
|
322217b335
|
!148 记录操作日志
Merge pull request !148 from dxfeng/feature/dxf
|
2022-07-07 07:32:58 +00:00 |
|
dxfeng
|
7103eb0c73
|
记录操作日志
|
2022-07-07 15:32:30 +08:00 |
|
dxfeng
|
71d6a40fbc
|
!147 记录操作日志
Merge pull request !147 from dxfeng/feature/dxf
|
2022-07-07 06:21:18 +00:00 |
|
dxfeng
|
e83e3b90fc
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-07-07 14:20:18 +08:00 |
|
dxfeng
|
40a7c066a2
|
记录操作日志
|
2022-07-07 14:19:56 +08:00 |
 reset
|
4ce84936f5
|
!146 日期组合
Merge pull request !146 from reset/feature/cl
|
2022-07-07 03:55:35 +00:00 |
|
Chengliang
|
0bdcc18c56
|
日期组合改造
|
2022-07-07 11:54:21 +08:00 |
|
MustangDeng
|
b589056585
|
组织结构图接口
|
2022-07-07 10:14:25 +08:00 |
|
dxfeng
|
990fda9f12
|
!145 记录操作日志
Merge pull request !145 from dxfeng/feature/dxf
|
2022-07-06 07:43:53 +00:00 |
|
dxfeng
|
2702b175cd
|
记录操作日志
|
2022-07-06 15:43:16 +08:00 |
|
dxfeng
|
8410a9d77f
|
!144 记录操作日志
Merge pull request !144 from dxfeng/feature/dxf
|
2022-07-06 03:44:21 +00:00 |
|
dxfeng
|
cca52d7080
|
记录操作日志
|
2022-07-06 11:44:07 +08:00 |
|
dxfeng
|
5f779e9bc4
|
!143 记录操作日志
Merge pull request !143 from dxfeng/feature/dxf
|
2022-07-06 02:15:51 +00:00 |
|
dxfeng
|
c139cd408a
|
记录操作日志
|
2022-07-06 10:15:26 +08:00 |
|
dxfeng
|
8c0c8ace55
|
!142 记录操作日志,岗位优化
Merge pull request !142 from dxfeng/feature/dxf
|
2022-07-05 10:48:32 +00: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
|
02608d5108
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-07-05 18:45:03 +08:00 |
|
dxfeng
|
278194a4a3
|
记录操作日志,岗位优化
|
2022-07-05 18:44:45 +08:00 |
|
dxfeng
|
3923dab45b
|
记录操作日志
|
2022-07-05 15:17:22 +08:00 |
|
dxfeng
|
f5d95fabb2
|
记录操作日志
|
2022-07-05 15:15:00 +08:00 |
|
dxfeng
|
e85019a665
|
!140 操作日志
Merge pull request !140 from dxfeng/feature/dxf
|
2022-07-05 01:42:31 +00: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 |
|
reset
|
01f3c8e7fe
|
!139 需求优化
Merge pull request !139 from reset/feature/cl
|
2022-07-04 09:54:38 +00:00 |
|
Chengliang
|
46aeddea39
|
需求调整
|
2022-07-04 17:51:31 +08:00 |
|
reset
|
d103b0fec0
|
!138 去除weaverboot引用
Merge pull request !138 from reset/feature/cl
|
2022-07-04 06:26:27 +00:00 |
|
Chengliang
|
eec9446dcd
|
去除weaverboot引用
|
2022-07-04 14:24:20 +08:00 |
|
dxfeng
|
6b96ea7ca0
|
人员列表 搜索条件
|
2022-07-04 10:01:28 +08:00 |
|
dxfeng
|
23212207b3
|
!137 人员列表查询系统表 异常信息处理
Merge pull request !137 from dxfeng/feature/dxf
|
2022-07-04 01:19:44 +00:00 |
|
dxfeng
|
03f59d55d0
|
人员列表查询系统表 异常信息处理
|
2022-07-04 09:18:56 +08:00 |
|
dxfeng
|
5291c3b855
|
分部列表BUG修复
|
2022-07-01 17:46:25 +08:00 |
|
dxfeng
|
37abad0f84
|
!136 人员导入
Merge pull request !136 from dxfeng/feature/dxf
|
2022-07-01 07:38:59 +00:00 |
|
dxfeng
|
1a1646e818
|
人员导入
|
2022-07-01 15:37:25 +08:00 |
|
dxfeng
|
2ea2626585
|
!135 人员导入
Merge pull request !135 from dxfeng/feature/dxf
|
2022-07-01 06:03:03 +00:00 |
|
dxfeng
|
fca0bb4dad
|
人员导入
|
2022-07-01 14:02:03 +08:00 |
|
dxfeng
|
3ffb85daba
|
!134 人员导入，日志表结构
Merge pull request !134 from dxfeng/feature/dxf
|
2022-06-30 08:26:32 +00:00 |
|
dxfeng
|
d508a4d9d0
|
人员导入，日志表结构
|
2022-06-30 16:22:57 +08:00 |
|
dxfeng
|
ecd6ba8f56
|
!133 人员导入
Merge pull request !133 from dxfeng/feature/dxf
|
2022-06-30 06:21:36 +00:00 |
|
dxfeng
|
66f5438d17
|
人员导入
|
2022-06-30 14:20:59 +08:00 |