325 Commits

Author SHA1 Message Date
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
杜建超
ca86e83244 fix 2020-10-16 11:23:08 +08:00
wulin
e011c15c0e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-16 10:27:56 +08:00
wulin
c413c87269 修改请求实体的当前页,页数参数名称 2020-10-16 10:27:52 +08:00
杜建超
bb47c84dda Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-16 09:42:20 +08:00
杜建超
21f0fdcb85 fix 2020-10-16 09:42:15 +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
杜建超
ce09b75fc0 fix 2020-10-15 10:15:55 +08:00
杜建超
9cf848b01d fix 2020-10-15 09:51:44 +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
杜建超
441457439e fix 2020-10-14 15:39:01 +08:00
杜建超
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