杜建超
|
3e496962b1
|
fix
|
2020-10-27 17:04:15 +08:00 |
|
杜建超
|
82bfc20cd4
|
fiz
|
2020-10-27 16:45:40 +08:00 |
|
杜建超
|
1206daa643
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-27 16:20:16 +08:00 |
|
杜建超
|
0df78fc7a3
|
fix
|
2020-10-27 16:20:12 +08:00 |
|
wulin
|
64efab57b9
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-27 16:08:38 +08:00 |
|
wulin
|
0d33e10774
|
添加获取绩效详情
|
2020-10-27 16:08:33 +08:00 |
|
杜建超
|
fcf9ec460b
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-27 15:56:07 +08:00 |
|
杜建超
|
4f3a52596f
|
fix
|
2020-10-27 15:56:03 +08:00 |
|
wulin
|
c8c492e9ad
|
解决冲突
|
2020-10-27 14:55:46 +08:00 |
|
wulin
|
b95bb856d1
|
发起考核时返回发起对象
|
2020-10-27 14:54:58 +08:00 |
|
杜建超
|
45ec4229bf
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-27 14:31:49 +08:00 |
|
杜建超
|
cebe1b1a55
|
fix
|
2020-10-27 14:31:44 +08:00 |
|
wulin
|
ede0acde37
|
引用初始化lz_flow_record表
|
2020-10-27 14:05:47 +08:00 |
|
杜建超
|
02510f9ee6
|
fix
|
2020-10-27 11:45:25 +08:00 |
|
杜建超
|
4c0ff8225e
|
fix
|
2020-10-27 11:41:36 +08:00 |
|
杜建超
|
a774ec4bfa
|
fix
|
2020-10-27 10:52:19 +08:00 |
|
杜建超
|
515dadf812
|
fix
|
2020-10-26 18:04:11 +08:00 |
|
杜建超
|
1ebb514d10
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-26 17:05:52 +08:00 |
|
杜建超
|
353daceb41
|
fix
|
2020-10-26 17:05:46 +08:00 |
|
wulin
|
8ade53dfb1
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-26 16:29:19 +08:00 |
|
wulin
|
86fc82ae8c
|
修复当人员在多个部门时，获取部门几级领导异常。目前搜索第一个为准
|
2020-10-26 16:29:14 +08:00 |
|
杜建超
|
2f519074d3
|
fix
|
2020-10-26 16:19:52 +08:00 |
|
杜建超
|
4681cb93fb
|
fix
|
2020-10-26 16:19:25 +08:00 |
|
wulin
|
32b613501b
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-26 15:04:03 +08:00 |
|
wulin
|
2dbc72645e
|
一些操作放到service里面，并添加手动事务回滚操作
|
2020-10-26 15:03:58 +08:00 |
|
杜建超
|
1f9c89769c
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-26 14:28:44 +08:00 |
|
杜建超
|
82cade6318
|
fix
|
2020-10-26 14:28:40 +08:00 |
|
wulin
|
023876e362
|
修复发起考核bug
|
2020-10-26 14:08:21 +08:00 |
|
wulin
|
dd845a1ac7
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-26 11:56:08 +08:00 |
|
wulin
|
ad3eefc453
|
lz_flow_approval_role修改roleId为String
|
2020-10-26 11:56:04 +08:00 |
|
quyixiao
|
ca52289161
|
提交修改
|
2020-10-26 11:51:39 +08:00 |
|
wulin
|
6cea3c3e7a
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-26 11:27:21 +08:00 |
|
wulin
|
b2ab60cb16
|
修复发起考核bug
|
2020-10-26 11:27:15 +08:00 |
|
杜建超
|
2a18e0b3a8
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-26 11:03:52 +08:00 |
|
杜建超
|
cd7ae3deb0
|
fix
|
2020-10-26 11:03:34 +08:00 |
|
wulin
|
138a298c43
|
当获取节点时的开启关闭状态不对
|
2020-10-26 10:58:57 +08:00 |
|
wulin
|
9b9abc0f2e
|
修复保存节点小流程时没有保存关闭节点功能更
|
2020-10-26 10:29:33 +08:00 |
|
wulin
|
f1b01745cf
|
修复隐藏bug
|
2020-10-26 10:22:09 +08:00 |
|
wulin
|
5d90b5ccfb
|
优化发起考核相关
|
2020-10-26 09:16:15 +08:00 |
|
wulin
|
3f4a1612ee
|
修复问题
|
2020-10-25 23:46:29 +08:00 |
|
wulin
|
10b076b031
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-25 22:21:27 +08:00 |
|
wulin
|
944846d7ec
|
发起考核功能基本完成
|
2020-10-25 22:21:22 +08:00 |
|
杜建超
|
8fc5e10d4d
|
fix
|
2020-10-23 18:18:24 +08:00 |
|
wulin
|
1fe86fda4c
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-23 18:12:16 +08:00 |
|
wulin
|
474adeb112
|
改的多，就不愿意描述
|
2020-10-23 18:12:10 +08:00 |
|
杜建超
|
b212baa434
|
fix
|
2020-10-23 17:56:34 +08:00 |
|
杜建超
|
aa7dfccc0c
|
fix
|
2020-10-23 17:55:59 +08:00 |
|
wulin
|
6a5f7c63e4
|
修复无法启动问题
|
2020-10-23 09:07:10 +08:00 |
|
wulin
|
b3e7fc8d51
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-22 18:01:49 +08:00 |
|
wulin
|
d9516cee01
|
获取考评组信息时返回department_id
|
2020-10-22 18:01:44 +08:00 |
|