Mlin
|
7f51135424
|
定时任务
|
2022-12-14 17:42:59 +08:00 |
 dxfeng
|
42545745fe
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-12-14 15:38:59 +08:00 |
|
dxfeng
|
946354b32d
|
BUG修复
|
2022-12-14 15:38:29 +08:00 |
|
Mlin
|
1db1949a94
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-12-14 14:32:40 +08:00 |
|
Mlin
|
43f00f7d9d
|
sqlserver存入版本修复、定时任务
|
2022-12-14 14:32:19 +08:00 |
|
dxfeng
|
d2f6fa693a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-12-14 10:58:09 +08:00 |
|
dxfeng
|
4117a34928
|
BUG修复
|
2022-12-14 10:52:20 +08:00 |
|
dxfeng
|
8383c08a06
|
BUG修复
|
2022-12-13 18:19:12 +08:00 |
|
Mlin
|
9c80a74386
|
oracle、sqlserver查询版本语句(部门存入失败)
|
2022-12-13 16:38:06 +08:00 |
|
dxfeng
|
b9d06b4246
|
分权功能版本回退，岗位BUG修复
|
2022-12-13 15:57:21 +08:00 |
|
Mlin
|
5897ae1563
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-12-13 15:01:11 +08:00 |
|
Mlin
|
e81d8f4939
|
oracle、sqlserver查询版本语句
|
2022-12-13 14:58:22 +08:00 |
|
dxfeng
|
fab4614cd5
|
分权功能重构，调用EC方法
|
2022-12-13 10:58:57 +08:00 |
|
dxfeng
|
6169b007ae
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-12-09 17:05:01 +08:00 |
|
Mlin
|
32e8eb4890
|
分部、部门版本控制写入逻辑
|
2022-12-09 16:57:42 +08:00 |
|
Mlin
|
1bdc7e2fa4
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-12-09 16:04:50 +08:00 |
|
Mlin
|
13ae136872
|
部门版本控制写入逻辑
|
2022-12-09 16:04:35 +08:00 |
|
dxfeng
|
06c9912d21
|
BUG修复,岗位关联关系调整
|
2022-12-09 15:07:34 +08:00 |
|
dxfeng
|
3470ba04cd
|
岗位关联关系调整
|
2022-12-09 14:29:20 +08:00 |
|
Mlin
|
73dbaf75ac
|
分部版本控制写入逻辑
|
2022-12-09 08:50:23 +08:00 |
|
dxfeng
|
c1c812596d
|
BUG修复
|
2022-12-08 17:10:31 +08:00 |
|
dxfeng
|
f89ebdb965
|
分部、部门联调。BUG修复
|
2022-12-08 14:16:58 +08:00 |
 Chengliang
|
d345a5fe66
|
版本管理
|
2022-12-08 09:56:25 +08:00 |
|
dxfeng
|
64af65cad3
|
部门导入新增、更新
|
2022-12-06 17:11:48 +08:00 |
|
dxfeng
|
54c3676c07
|
分部BUG修复，导入接口逻辑重写
|
2022-12-06 14:47:50 +08:00 |
|
dxfeng
|
85ec966813
|
人员卡片查看页面逻辑重写
|
2022-12-05 17:57:33 +08:00 |
|
dxfeng
|
bd33075e14
|
部门管理功能逻辑调整
|
2022-11-30 16:06:40 +08:00 |
|
dxfeng
|
40a6540a1d
|
部门管理功能逻辑调整
|
2022-11-30 15:55:27 +08:00 |
|
dxfeng
|
238d8e6f75
|
部门接口逻辑调整
|
2022-11-29 17:00:31 +08:00 |
|
dxfeng
|
9a2eabc8bd
|
部门切换数据源、实体类更新
|
2022-11-29 09:54:18 +08:00 |
|
dxfeng
|
aa3d0742ff
|
分部接口整理、代码优化
|
2022-11-28 11:15:54 +08:00 |
|
dxfeng
|
416471a283
|
分部列表、新增、删除、转移功能重写
|
2022-11-24 17:56:32 +08:00 |
|
dxfeng
|
f7758e5298
|
人员导入提示信息优化
|
2022-11-23 09:34:06 +08:00 |
|
dxfeng
|
ae2e5bb5a4
|
人员Mapper整合
|
2022-11-21 10:58:12 +08:00 |
|
dxfeng
|
7d1fc84fad
|
组织架构树排序、人员卡片BUG修复
|
2022-11-18 16:28:02 +08:00 |
|
dxfeng
|
a273008715
|
导入BUG，提示信息优化
|
2022-11-17 11:36:52 +08:00 |
|
dxfeng
|
81943df058
|
编制、分部树排序
|
2022-11-16 17:39:58 +08:00 |
|
dxfeng
|
9b20c6838a
|
人事卡片按钮权限BUG
|
2022-11-16 16:09:32 +08:00 |
|
dxfeng
|
17f4789e33
|
BUG修复
|
2022-11-16 14:59:22 +08:00 |
|
dxfeng
|
05364f9265
|
BUG修复
|
2022-11-16 13:39:56 +08:00 |
|
dxfeng
|
10bb8159aa
|
明细表BUG修复
|
2022-11-14 19:13:35 +08:00 |
|
dxfeng
|
7b5a4905dc
|
BUG修复、卡片按钮排序
|
2022-11-14 11:19:08 +08:00 |
|
dxfeng
|
4a0ddd8adc
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2022-11-11 17:24:55 +08:00 |
|
dxfeng
|
cd11f06b7f
|
卡片按钮新增、删除
|
2022-11-11 17:24:22 +08:00 |
‘ml’
|
091f202eac
|
职务导入
|
2022-11-11 16:50:35 +08:00 |
|
dxfeng
|
854a40b7cd
|
人员卡片按钮自定义
|
2022-11-11 14:11:34 +08:00 |
|
dxfeng
|
d16f13405c
|
人员卡片按钮自定义
|
2022-11-11 13:59:45 +08:00 |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
2022-11-11 09:09:53 +08:00 |
|
‘ml’
|
0da123fcef
|
Merge branch 'feature/ml' into develop
# Conflicts:
# src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
|
2022-11-10 10:58:00 +08:00 |
|
‘ml’
|
ec8be58a45
|
职等职级导入接口
|
2022-11-10 10:55:56 +08:00 |