621 Commits

Author SHA1 Message Date
quyixiao
184cd5d8e6 rjuq whnt 2020-10-27 15:35:39 +08:00
quyixiao
8d7cb7dc39 提交修改 2020-10-27 14:58:47 +08:00
quyixiao
0836ce27be 提交修改 2020-10-27 14:58:14 +08:00
wulin
c8c492e9ad 解决冲突 2020-10-27 14:55:46 +08:00
wulin
b95bb856d1 发起考核时返回发起对象 2020-10-27 14:54:58 +08:00
quyixiao
162c01b73b 提交修改 2020-10-27 14:34:37 +08:00
quyixiao
4a27bc2692 提交修改 2020-10-27 14:34:10 +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
wulin
056020f0fc Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 12:07:28 +08:00
quyixiao
39a5398c99 提交修改 2020-10-27 12:05:23 +08:00
wulin
31eec17e0e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 12:05:23 +08:00
quyixiao
1880e48eab 提交修改 2020-10-27 11:49:08 +08:00
quyixiao
d8af83e0fb 提交修改 2020-10-27 11:48:32 +08:00
杜建超
02510f9ee6 fix 2020-10-27 11:45:25 +08:00
杜建超
4c0ff8225e fix 2020-10-27 11:41:36 +08:00
wulin
4d33a7fe35 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 11:13:19 +08:00
wulin
daad5e41f6 修改发起考核接口, 2020-10-27 11:13:13 +08:00
杜建超
f4a30d65e5 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-27 10:52:24 +08:00
杜建超
a774ec4bfa fix 2020-10-27 10:52:19 +08:00
quyixiao
cbd67d402b 提交修改 2020-10-26 19:03:13 +08:00
quyixiao
41e6a8a7c7 提交修改 2020-10-26 18:52:53 +08:00
quyixiao
1217c67b32 提交儿童睡袋 t 2020-10-26 18:52:11 +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
quyixiao
d90ea0b15a 提交修改 2020-10-26 16:01:20 +08:00
quyixiao
7044bebf95 提交修改 2020-10-26 15:54:51 +08:00
quyixiao
4aa5aa4dd4 提交修改 2020-10-26 15:37:58 +08:00
quyixiao
fb945d20a9 提交修改 2020-10-26 15:36:20 +08:00
wulin
5c896280de flowchart添加字段 2020-10-26 15:35:39 +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
847a057275 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-26 14:08:30 +08:00
wulin
023876e362 修复发起考核bug 2020-10-26 14:08:21 +08:00
quyixiao
564cbe371f 提交修改 2020-10-26 12:27:39 +08:00
quyixiao
da1faab253 提交修改 2020-10-26 12:27:15 +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
quyixiao
d1957ecad6 提交修改 2020-10-26 11:51:05 +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