298 Commits

Author SHA1 Message Date
杜建超
8f71c7f2c4 fix 2020-10-14 15:18:05 +08:00
杜建超
9c7b65d917 fix 2020-10-14 11:47:07 +08:00
杜建超
8ff78938fa fix 2020-10-14 11:40:24 +08:00
wulin
cd8fe0105b Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-14 09:50:50 +08:00
wulin
4fcc47e9fe 增加流程节点和权限关系表 2020-10-14 09:50:43 +08:00
杜建超
580ee6ba57 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-13 18:27:16 +08:00
杜建超
9a39df5b50 fix 2020-10-13 18:27:02 +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
杜建超
42d85bb4b6 fix 2020-10-13 17:54:47 +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
杜建超
d052dd10fb fix 2020-10-13 14:02:25 +08:00
quyixiao
d21a33863e 提交修改 2020-10-12 10:54:09 +08:00
quyixiao
2a61ea0781 提交修改 2020-10-10 15:54:44 +08:00
杜建超
af1486b48e fix 2020-09-29 20:10:41 +08:00
杜建超
ea287c6ae3 Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report 2020-09-29 19:31:52 +08:00
杜建超
76d4a18cb8 fix 2020-09-29 19:31:45 +08:00
quyixiao
cb19e6a52f 提交修改 2020-09-29 17:23:17 +08:00
quyixiao
b9c99c3ffe 提交修改 2020-09-29 16:53:44 +08:00
quyixiao
52e7520506 提交修改 2020-09-29 14:23:40 +08:00
quyixiao
176209f9cd 提交修改 2020-09-29 14:23:21 +08:00
杜建超
e2e5bf581e Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report 2020-09-29 13:58:00 +08:00
杜建超
ef9985b04e fix 2020-09-29 13:57:12 +08:00
quyixiao
4c131847c5 提交修改 2020-09-29 11:36:11 +08:00
quyixiao
a08797fee4 提交修改 2020-09-29 10:34:54 +08:00
quyixiao
de8fa66bb3 提交修改 2020-09-29 09:59:57 +08:00
quyixiao
7e5452428c 提交修改 2020-09-29 08:57:56 +08:00
quyixiao
e80cf744f8 提交修改 2020-09-29 08:57:29 +08:00
杜建超
173064fbc1 fix 2020-09-28 17:20:14 +08:00
杜建超
5745c24f6c fix 2020-09-28 16:55:29 +08:00
杜建超
c873d0569c fix 2020-09-28 10:16:08 +08:00
杜建超
dec93bf39b Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report 2020-09-27 17:54:17 +08:00
杜建超
bd2de3c75c fix 2020-09-27 17:53:58 +08:00
wulin
9cd27c4622 Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report 2020-09-27 17:41:31 +08:00
wulin
ae8155db37 修复测试中发现的规格等bug 2020-09-27 17:41:25 +08:00
quyixiao
b6058f98df 提交修改 2020-09-27 16:05:42 +08:00
quyixiao
8c1b7d5186 提交修改 2020-09-27 16:05:26 +08:00
wulin
a18edeef4e 增加修改type,brand,specs名称的时候同步修改equipment_info表中对应的名称 2020-09-27 15:27:24 +08:00
wulin
2b4e7023d3 修复specsId bug 2020-09-27 15:11:37 +08:00
wulin
469a9f7098 增加equipment_info的三个类型的id 2020-09-27 15:02:02 +08:00
杜建超
2b09014842 fix 2020-09-27 09:50:24 +08:00
杜建超
8cdd665768 fix 2020-09-27 09:48:06 +08:00
wulin
b45a47dfa1 Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report 2020-09-25 19:28:42 +08:00