 dxfeng
|
d6c1ea3bc7
|
!232 BUG修复
Merge pull request !232 from dxfeng/feature/dxf
|
2022-09-07 11:19:18 +00:00 |
|
dxfeng
|
0a87a2ad4d
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-09-07 19:17:10 +08:00 |
 reset
|
c204918352
|
!231 bug修复
Merge pull request !231 from reset/feature/cl
|
2022-09-07 11:14:36 +00:00 |
|
dxfeng
|
91a8ad0bd3
|
导入BUG
|
2022-09-07 19:12:47 +08:00 |
|
Chengliang
|
c280c5f908
|
fixed
|
2022-09-07 19:12:42 +08:00 |
|
dxfeng
|
59f76c012c
|
触发器，分部、部门赋值，SQL脚本
|
2022-09-07 15:40:19 +08:00 |
|
dxfeng
|
affcbf0e38
|
!230 BUG修复
Merge pull request !230 from dxfeng/feature/dxf
|
2022-09-06 09:25:33 +00:00 |
|
dxfeng
|
34af4f95c9
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-09-06 17:23:57 +08:00 |
|
dxfeng
|
79c5f94862
|
导入问题处理
|
2022-09-06 17:23:44 +08:00 |
|
dxfeng
|
120b4efdba
|
不同等级方案、编号可重复
|
2022-09-06 15:38:16 +08:00 |
|
reset
|
2be21bc0e9
|
!229 fixed
Merge pull request !229 from reset/feature/cl
|
2022-09-06 07:33:08 +00:00 |
|
Chengliang
|
8553e37c22
|
fixed
|
2022-09-06 15:31:24 +08:00 |
|
Chengliang
|
1c900eafc9
|
Merge remote-tracking branch 'origin/develop' into feature/cl
# Conflicts:
# src/com/engine/organization/service/impl/CompServiceImpl.java
|
2022-09-06 15:30:09 +08:00 |
|
dxfeng
|
6765fd8fc4
|
左侧树排序
|
2022-09-06 15:19:16 +08:00 |
|
Chengliang
|
ba0b31f086
|
fixed
|
2022-09-06 14:26:09 +08:00 |
|
dxfeng
|
4cb7e0db46
|
!228 表结构更新
Merge pull request !228 from dxfeng/feature/dxf
|
2022-09-06 06:01:51 +00:00 |
|
dxfeng
|
900ded1aad
|
表结构更新
|
2022-09-06 14:01:01 +08:00 |
|
dxfeng
|
0edebd1063
|
!227 分部、部门按钮；SQL脚本
Merge pull request !227 from dxfeng/feature/dxf
|
2022-09-06 02:52:54 +00:00 |
|
dxfeng
|
278d61c499
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-09-06 10:51:35 +08:00 |
|
dxfeng
|
077945dfa1
|
表结构更新
|
2022-09-06 10:51:07 +08:00 |
|
reset
|
493926e758
|
!226 fixed
Merge pull request !226 from reset/feature/cl
|
2022-09-06 02:38:21 +00:00 |
|
Chengliang
|
3e06077e2a
|
fixed
|
2022-09-06 10:34:23 +08:00 |
|
dxfeng
|
6c04ffd384
|
编制管理
|
2022-09-06 10:33:46 +08:00 |
|
dxfeng
|
6415ee3eb7
|
编制方案
|
2022-09-06 09:45:56 +08:00 |
|
dxfeng
|
d65551c0ee
|
复制BUG修复
|
2022-09-05 18:33:20 +08:00 |
|
dxfeng
|
b1b2a9a88a
|
部门管理，更新为EC
|
2022-09-05 17:25:11 +08:00 |
|
dxfeng
|
4fa38f704c
|
分部管理，更新为EC
|
2022-09-05 15:58:46 +08:00 |
|
dxfeng
|
f05cf6da8f
|
BUG修复
|
2022-09-05 10:51:08 +08:00 |
|
reset
|
38a1fca585
|
!224 bug修复
Merge pull request !224 from reset/feature/cl
|
2022-09-02 09:49:26 +00:00 |
|
Chengliang
|
0ffb0bac33
|
fix
|
2022-09-02 17:48:14 +08:00 |
|
dxfeng
|
607030f02c
|
!223 使用状态BUG修复
Merge pull request !223 from dxfeng/feature/dxf
|
2022-09-02 09:34:19 +00:00 |
|
dxfeng
|
337f8e51ed
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-09-02 17:32:14 +08:00 |
|
dxfeng
|
989526bc26
|
使用状态BUG修复
|
2022-09-02 17:31:44 +08:00 |
|
reset
|
1042bee397
|
!222 bug修复
Merge pull request !222 from reset/feature/cl
|
2022-09-02 08:19:29 +00:00 |
|
Chengliang
|
819a053aa3
|
fixed
|
2022-09-02 16:17:01 +08:00 |
|
reset
|
8ac890814f
|
!221 table列宽修复
Merge pull request !221 from reset/feature/cl
|
2022-09-02 03:29:07 +00:00 |
|
Chengliang
|
f5fcbdaff8
|
列表宽度顺序调整
|
2022-09-02 11:23:16 +08:00 |
|
dxfeng
|
d6338ac223
|
表结构SQL更新
|
2022-09-02 09:04:11 +08:00 |
|
reset
|
385ff8331e
|
!220 fixed
Merge pull request !220 from reset/feature/cl
|
2022-09-01 09:05:18 +00:00 |
|
Chengliang
|
3eb29f823f
|
fixed
|
2022-09-01 17:03:45 +08:00 |
|
dxfeng
|
09d624b46b
|
!219 触发器、非标开关
Merge pull request !219 from dxfeng/feature/dxf
|
2022-09-01 09:02:15 +00:00 |
|
dxfeng
|
489ad2fdd0
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-09-01 17:00:38 +08:00 |
|
dxfeng
|
2931d1884b
|
SQL
|
2022-09-01 17:00:23 +08:00 |
|
dxfeng
|
b49a25742a
|
触发器、非标开关
|
2022-09-01 16:57:06 +08:00 |
|
reset
|
6964fa509b
|
!218 fixed
Merge pull request !218 from reset/feature/cl
|
2022-09-01 05:52:15 +00:00 |
|
Chengliang
|
80d3202c70
|
fixed
|
2022-09-01 13:49:21 +08:00 |
|
Chengliang
|
b5b90a6403
|
修复组织架构图跳转问题
|
2022-09-01 10:16:58 +08:00 |
|
dxfeng
|
1f7f299368
|
分部、部门、岗位触发器
|
2022-08-31 14:24:00 +08:00 |
|
dxfeng
|
56ed6aa197
|
BUG修复
|
2022-08-30 10:46:42 +08:00 |
|
dxfeng
|
6dd3a8a8e6
|
!216 BUG修复
Merge pull request !216 from dxfeng/feature/dxf
|
2022-08-29 09:08:08 +00:00 |