89 Commits

Author SHA1 Message Date
wulin
c5b51dd21e Fix 2020-10-21 20:53:42 +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
cec8d658ce 查询部门增加code 2020-10-20 16:08:00 +08:00
wulin
8b51e6edfb 部门人员接口哟划 2020-10-20 15:48:42 +08:00
wulin
be1b6d3610 增加获取考核组详情接口 2020-10-20 11:06:25 +08:00
wulin
e6ba9b1635 更新部分代码 2020-10-20 09:41:55 +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
杜建超
53812d9e3d fix 2020-10-16 15:10:03 +08:00
杜建超
434118adca Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-16 14:59:57 +08:00
杜建超
cc8269b31f fix 2020-10-16 14:59:51 +08:00
wulin
fbfb9a4ade Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-16 13:45:00 +08:00
wulin
1c20927771 增加信表相关代码 2020-10-16 13:44:54 +08:00
杜建超
17b6952507 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-16 11:23:17 +08:00
杜建超
ca86e83244 fix 2020-10-16 11:23:08 +08:00
wulin
c413c87269 修改请求实体的当前页,页数参数名称 2020-10-16 10:27:52 +08:00
wulin
d024b7b3ac 集成knife4j-spring-ui说明文档 2020-10-16 09:41:47 +08:00
wulin
ca198ac75c 增加相关表的dto 2020-10-15 10:51:58 +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
杜建超
8ff78938fa fix 2020-10-14 11:40:24 +08:00
wulin
4fcc47e9fe 增加流程节点和权限关系表 2020-10-14 09:50:43 +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
605c1d8d00 修复部分未引入包 2020-10-13 17:23:47 +08:00
wulin
03251953e4 修改mysqlmain增加swagger对像的部分注解 2020-10-13 17:21:16 +08:00
杜建超
7ff9ceb1d5 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-13 15:26:31 +08:00
杜建超
89efd3ef51 fix 2020-10-13 15:26:26 +08:00
wulin
de46cfb740 修复报错问题 2020-10-13 15:25:45 +08:00
wulin
8076ef6ce5 增加新表的相关代码 2020-10-13 15:03:17 +08:00
quyixiao
2a61ea0781 提交修改 2020-10-10 15:54:44 +08:00
quyixiao
b9c99c3ffe 提交修改 2020-09-29 16:53:44 +08:00
quyixiao
a08797fee4 提交修改 2020-09-29 10:34:54 +08:00
quyixiao
e8e7ad6f16 提交修改 2020-09-23 16:52:19 +08:00