 Chengliang
|
61aabb4ca1
|
测试
|
2022-09-20 14:24:26 +08:00 |
 dxfeng
|
7d99eb0a3a
|
!244 BUG修复
Merge pull request !244 from dxfeng/feature/dxf
|
2022-09-20 02:25:53 +00:00 |
|
dxfeng
|
2632f6c857
|
BUG修复
|
2022-09-20 10:25:13 +08:00 |
|
dxfeng
|
b214ec8509
|
BUG修复
|
2022-09-20 09:18:24 +08:00 |
|
dxfeng
|
672f0f9e11
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-09-19 13:28:14 +08:00 |
|
dxfeng
|
fe668c37e7
|
BUG修复
|
2022-09-19 13:27:50 +08:00 |
|
dxfeng
|
c49abcf77f
|
BUG修复
|
2022-09-16 16:56:30 +08:00 |
|
dxfeng
|
c8eb2f3451
|
BUG修复
|
2022-09-16 14:48:00 +08:00 |
|
dxfeng
|
abf5840f72
|
!243 BUG修复
Merge pull request !243 from dxfeng/feature/dxf
|
2022-09-16 03:29:20 +00:00 |
|
dxfeng
|
1b4d7203b8
|
BUG修复
|
2022-09-16 11:28:47 +08:00 |
|
dxfeng
|
b494a6a96e
|
BUG修复
|
2022-09-16 11:01:31 +08:00 |
|
dxfeng
|
e9e585990a
|
!242 BUG修复
Merge pull request !242 from dxfeng/feature/dxf
|
2022-09-16 02:23:08 +00:00 |
|
dxfeng
|
ca66929235
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-09-16 10:22:52 +08:00 |
|
dxfeng
|
29295bb464
|
BUG修复
|
2022-09-16 10:22:15 +08:00 |
|
dxfeng
|
1ea9dd5768
|
!241 编制导入
Merge pull request !241 from dxfeng/feature/dxf
|
2022-09-15 10:40:41 +00:00 |
|
dxfeng
|
4b3bb0d5f3
|
编制导入
|
2022-09-15 18:40:05 +08:00 |
|
dxfeng
|
2457cdd2a8
|
!240 编制导入
Merge pull request !240 from dxfeng/feature/dxf
|
2022-09-15 10:31:50 +00:00 |
|
dxfeng
|
16fcd76468
|
编制导入
|
2022-09-15 18:31:11 +08:00 |
|
dxfeng
|
9e0f34e680
|
!239 编制导入
Merge pull request !239 from dxfeng/feature/dxf
|
2022-09-15 08:52:55 +00:00 |
|
dxfeng
|
5522cb7058
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-09-15 16:51:52 +08:00 |
|
dxfeng
|
50e5c7312e
|
编制导入
|
2022-09-15 16:51:35 +08:00 |
|
dxfeng
|
db07451ece
|
!238 BUG 修复
Merge pull request !238 from dxfeng/feature/dxf
|
2022-09-15 02:47:02 +00:00 |
|
dxfeng
|
8b7b75b57b
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-09-15 10:43:38 +08:00 |
|
dxfeng
|
35439a442f
|
BUG 修复
|
2022-09-15 10:41:04 +08:00 |
|
reset
|
d4628f72ed
|
!237 顶部按钮修改
Merge pull request !237 from reset/feature/cl
|
2022-09-14 09:18:25 +00:00 |
|
Chengliang
|
fbd608a52a
|
顶部按钮修改
|
2022-09-14 17:14:12 +08:00 |
|
dxfeng
|
81ad78cc82
|
!236 部门复制
Merge pull request !236 from dxfeng/feature/dxf
|
2022-09-09 07:42:22 +00:00 |
|
dxfeng
|
76b9cd2a89
|
部门复制
|
2022-09-09 15:29:21 +08:00 |
|
dxfeng
|
62e4b33c37
|
!235 部门复制
Merge pull request !235 from dxfeng/feature/dxf
|
2022-09-09 06:51:22 +00:00 |
|
dxfeng
|
34d44b6c91
|
部门复制
|
2022-09-09 14:41:04 +08:00 |
|
dxfeng
|
8e385537da
|
BUG修复
|
2022-09-09 10:25:57 +08:00 |
|
dxfeng
|
3113ed1984
|
!234 部门合并、组织导入
Merge pull request !234 from dxfeng/feature/dxf
|
2022-09-08 09:56:17 +00:00 |
|
dxfeng
|
5c66744468
|
部门合并、组织导入
|
2022-09-08 17:54:46 +08:00 |
|
dxfeng
|
f6c41a3467
|
部门合并重写
|
2022-09-08 15:36:47 +08:00 |
|
reset
|
70aa760abc
|
!233 修复富文本长度
Merge pull request !233 from reset/feature/cl
|
2022-09-08 02:43:21 +00:00 |
|
Chengliang
|
6de1b0746f
|
修复富文本长度
|
2022-09-08 10:41:04 +08:00 |
|
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 |