杜建超
|
b212baa434
|
fix
|
2020-10-23 17:56:34 +08:00 |
|
杜建超
|
aa7dfccc0c
|
fix
|
2020-10-23 17:55:59 +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 |
|
杜建超
|
88bb449061
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-22 17:24:12 +08:00 |
|
杜建超
|
36e06f47ac
|
fix
|
2020-10-22 17:24:07 +08:00 |
|
wulin
|
a217e45b6f
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-22 17:19:44 +08:00 |
|
wulin
|
838e751775
|
获取组模板列表是无法返回登记id
|
2020-10-22 17:19:39 +08:00 |
|
杜建超
|
51d9cfbc5b
|
fix
|
2020-10-22 17:17:05 +08:00 |
|
杜建超
|
184b530481
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-22 15:47:00 +08:00 |
|
杜建超
|
6d1f1f1f42
|
fix
|
2020-10-22 15:46:54 +08:00 |
|
wulin
|
cd93891f21
|
获取
|
2020-10-22 15:06:20 +08:00 |
|
wulin
|
d6fd83df5d
|
解决冲突
|
2020-10-22 12:09:38 +08:00 |
|
wulin
|
662c38011b
|
修复bug
|
2020-10-22 12:07:31 +08:00 |
|
杜建超
|
4d85c2bde7
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-22 11:56:08 +08:00 |
|
杜建超
|
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 |
|