467 Commits

Author SHA1 Message Date
杜建超
3c403c1d28 fix 2020-10-22 11:55:55 +08:00
wulin
91fa248be4 增加param 2020-10-22 09:51:51 +08:00
wulin
96c18e66e0 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-22 09:45:26 +08:00
wulin
ea176a3155 修复对判空的支持 2020-10-22 09:45:22 +08:00
杜建超
382ea51922 fix 2020-10-22 09:45:02 +08:00
wulin
b9397343c9 解决冲突 2020-10-21 20:51:12 +08:00
wulin
cadab4891a 新增保存戒掉小流程列表,修改保存考核指标为列表 2020-10-21 20:50:22 +08:00
杜建超
ed4f1e3736 fix 2020-10-21 18:12:15 +08:00
杜建超
35afe09d7a fix 2020-10-21 17:05:43 +08:00
杜建超
6e73c4da7d fix 2020-10-21 17:04:56 +08:00
wulin
ddf11e0134 流程小节点增加权重
"
2020-10-21 16:23:07 +08:00
wulin
4ea78046df Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-21 14:31:03 +08:00
wulin
379cb16def 考核组相关的保存和编辑接口合并 2020-10-21 14:30:58 +08:00
quyixiao
03c55402bc 提交修改 2020-10-21 11:49:27 +08:00
杜建超
4e89c24e49 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-21 11:16:14 +08:00
杜建超
53ed800463 fix 2020-10-21 11:16:08 +08:00
quyixiao
9177eab432 rjuq whnt 2020-10-21 11:12:12 +08:00
wulin
302d4c744c 考核组列表返回考核人数 2020-10-21 10:27:49 +08:00
wulin
308cfa766e 搜索部门人员时增加group by去重 2020-10-20 17:30:22 +08:00
杜建超
47bc97664e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-20 17:03:42 +08:00
杜建超
fc12b8d9e5 fix 2020-10-20 17:03:36 +08:00
wulin
cec8d658ce 查询部门增加code 2020-10-20 16:08:00 +08:00
wulin
d881e9336b 修复部门接口可以查询到删除的数据 2020-10-20 15:57:26 +08:00
wulin
8b51e6edfb 部门人员接口哟划 2020-10-20 15:48:42 +08:00
wulin
be1b6d3610 增加获取考核组详情接口 2020-10-20 11:06:25 +08:00
wulin
b1d4be8f67 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-20 09:42:00 +08:00
wulin
e6ba9b1635 更新部分代码 2020-10-20 09:41:55 +08:00
杜建超
4fbc66d1a4 fix 2020-10-19 16:53:15 +08:00
wulin
32861dc01f 增加节点小流程记录表 2020-10-19 14:45:43 +08:00
wulin
a9a2349cd5 增加部分接口,修改部分表代码 2020-10-19 11:36:25 +08:00
wulin
8b562bd684 解决冲突 2020-10-16 18:31:12 +08:00
wulin
ff273e0d03 修改部份表的字段 2020-10-16 18:29:28 +08:00
杜建超
2a6d4444df fix 2020-10-16 16:35:19 +08:00
杜建超
53812d9e3d fix 2020-10-16 15:10:03 +08:00
wulin
1c20927771 增加信表相关代码 2020-10-16 13:44:54 +08:00
wulin
d024b7b3ac 集成knife4j-spring-ui说明文档 2020-10-16 09:41:47 +08:00
wulin
e5a72e8351 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-15 10:52:06 +08:00
wulin
ca198ac75c 增加相关表的dto 2020-10-15 10:51:58 +08:00
杜建超
43f6a8f730 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-15 09:25:56 +08:00
杜建超
02df239792 fix 2020-10-15 09:25:50 +08:00
wulin
9883cbc9da Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-14 18:50:57 +08:00
wulin
739ac9bfd5 增加部分新表相关代码 2020-10-14 18:50:52 +08:00
杜建超
a2ce4c51a5 fix 2020-10-14 17:06:16 +08:00
杜建超
8f71c7f2c4 fix 2020-10-14 15:18:05 +08:00
wulin
4fcc47e9fe 增加流程节点和权限关系表 2020-10-14 09:50:43 +08:00
wulin
b348106652 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-13 17:55:36 +08:00
wulin
1e862292c1 修改dev的数据库为测试数据库 2020-10-13 17:55:32 +08:00
杜建超
47413b9ed1 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-13 17:43:20 +08:00
杜建超
8d9d82da6d fix 2020-10-13 17:43:14 +08:00
wulin
03251953e4 修改mysqlmain增加swagger对像的部分注解 2020-10-13 17:21:16 +08:00