414 Commits

Author SHA1 Message Date
quyixiao
9e1a5c591b 提交修改 2020-10-21 14:35:25 +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
bbde768178 提交修改 2020-10-21 14:20:10 +08:00
quyixiao
03c55402bc 提交修改 2020-10-21 11:49:27 +08:00
quyixiao
79777b07fa 提交修改 2020-10-21 11:28:00 +08:00
杜建超
cfdc86c01e fix 2020-10-21 11:17:42 +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
e8ce25942a Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-20 17:52:30 +08:00
wulin
a1a83d3778 修改同步员工信息时没有删除原来的对应关系 2020-10-20 17:52:25 +08:00
杜建超
e1f1b4eeb7 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-20 17:38:40 +08:00
杜建超
8dc443e1cc fix 2020-10-20 17:38:35 +08:00
杜建超
21f564ef87 fix 2020-10-20 17:36:37 +08:00
wulin
308cfa766e 搜索部门人员时增加group by去重 2020-10-20 17:30:22 +08:00
wulin
108deb03fc Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-20 17:08:18 +08:00
wulin
177fc83ac2 删除节点小流程改成get 2020-10-20 17:08:12 +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
079524fb44 新增几个编辑接口,删除接口 2020-10-20 17:00:53 +08:00
wulin
cec8d658ce 查询部门增加code 2020-10-20 16:08:00 +08:00
wulin
6764e848c2 修复部门type参数不起效 2020-10-20 16:00:55 +08:00
wulin
d881e9336b 修复部门接口可以查询到删除的数据 2020-10-20 15:57:26 +08:00
wulin
8b51e6edfb 部门人员接口哟划 2020-10-20 15:48:42 +08:00
wulin
62bacf2dda 修复bug 2020-10-20 12:13:29 +08:00
wulin
a63101d2c9 员工和部门接口说明修改 2020-10-20 12:07:17 +08:00
wulin
64df8406fa Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-20 11:06:30 +08:00
wulin
be1b6d3610 增加获取考核组详情接口 2020-10-20 11:06:25 +08:00
杜建超
a0eb7abe6f Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-20 10:08:28 +08:00
杜建超
1639334075 fix 2020-10-20 10:08:21 +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
杜建超
60ed977952 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-19 15:30:08 +08:00
杜建超
109b49db93 fix 2020-10-19 15:30:04 +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
杜建超
c62df55daf fix 2020-10-16 16:12:08 +08:00
杜建超
224f5f9f6c fix 2020-10-16 15:50:08 +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