Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 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
• 605c1d8d00 修复部分未引入包 wulin 2020-10-13 17:23:47 +08:00
• 03251953e4 修改mysqlmain增加swagger对像的部分注解 wulin 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
• de46cfb740 修复报错问题 wulin 2020-10-13 15:25:45 +08:00
• 8076ef6ce5 增加新表的相关代码 wulin 2020-10-13 15:03:17 +08:00
• d052dd10fb fix 杜建超 2020-10-13 14:02:25 +08:00
• d21a33863e 提交修改 quyixiao 2020-10-12 10:54:09 +08:00
• 2a61ea0781 提交修改 quyixiao 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
• cb19e6a52f 提交修改 quyixiao 2020-09-29 17:23:17 +08:00
• b9c99c3ffe 提交修改 quyixiao 2020-09-29 16:53:44 +08:00
• 52e7520506 提交修改 quyixiao 2020-09-29 14:23:40 +08:00
• 176209f9cd 提交修改 quyixiao 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
• 4c131847c5 提交修改 quyixiao 2020-09-29 11:36:11 +08:00
• a08797fee4 提交修改 quyixiao 2020-09-29 10:34:54 +08:00
• de8fa66bb3 提交修改 quyixiao 2020-09-29 09:59:57 +08:00
• 7e5452428c 提交修改 quyixiao 2020-09-29 08:57:56 +08:00
• e80cf744f8 提交修改 quyixiao 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
• 9cd27c4622 Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report wulin 2020-09-27 17:41:31 +08:00
• ae8155db37 修复测试中发现的规格等bug wulin 2020-09-27 17:41:25 +08:00
• b6058f98df 提交修改 quyixiao 2020-09-27 16:05:42 +08:00
• 8c1b7d5186 提交修改 quyixiao 2020-09-27 16:05:26 +08:00
• a18edeef4e 增加修改type,brand,specs名称的时候同步修改equipment_info表中对应的名称 wulin 2020-09-27 15:27:24 +08:00
• 2b4e7023d3 修复specsId bug wulin 2020-09-27 15:11:37 +08:00
• 469a9f7098 增加equipment_info的三个类型的id wulin 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
• b45a47dfa1 Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report wulin 2020-09-25 19:28:42 +08:00
• 82d7d70881 提交修改 wulin 2020-09-25 19:28:37 +08:00
• 43e65443a0 提交修改 quyixiao 2020-09-24 11:33:09 +08:00
• ea62b25c6b 提交修改 quyixiao 2020-09-24 11:32:32 +08:00
• b776c8418e fix 杜建超 2020-09-23 18:07:20 +08:00
• 00a30281e1 fix 杜建超 2020-09-23 18:05:10 +08:00
• 76e6dd840c 提交修改 quyixiao 2020-09-23 17:40:49 +08:00
• 8c9ca5f38c 提交修改 quyixiao 2020-09-23 16:52:46 +08:00
• e8e7ad6f16 提交修改 quyixiao 2020-09-23 16:52:19 +08:00
• e902f28d9a Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report wulin 2020-09-23 16:07:40 +08:00
• 2d7172e991 盘点次数管理优化 wulin 2020-09-23 16:07:34 +08:00
• 735e53effb 提交修改 quyixiao 2020-09-23 15:15:18 +08:00
• d13dbdc42d 提交修改 quyixiao 2020-09-23 11:22:40 +08:00
• b4dc5b8210 提交修改 quyixiao 2020-09-23 10:58:48 +08:00
• 95ecea6fcc 提交修改 quyixiao 2020-09-22 17:55:22 +08:00
• a6ef4bd937 提交修改 quyixiao 2020-09-22 17:08:26 +08:00
• b89bd9b444 提交修改 quyixiao 2020-09-22 17:08:09 +08:00
• 9beeb333d1 去掉Shiro配置不验证资产管理接口 wulin 2020-09-22 17:05:05 +08:00
• 9d5c3c9fb8 Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report wulin 2020-09-22 16:45:29 +08:00
• 2131e63ed1 钉钉免登增加判断是否离职 wulin 2020-09-22 16:45:25 +08:00
• d516af8bc3 Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report 杜建超 2020-09-22 16:17:04 +08:00
• c9d38933ca fix 杜建超 2020-09-22 16:16:57 +08:00
• b031dba1ee 提交修改 quyixiao 2020-09-22 15:56:56 +08:00
• 22fb25d890 合并资产管理分支 wulin 2020-09-22 14:49:22 +08:00
• 0033e7a266 完成后台资产相关管理 wulin 2020-09-22 14:46:05 +08:00
• c097dca611 fix 杜建超 2020-09-22 11:42:04 +08:00
• 36972f257f fix 杜建超 2020-09-22 11:35:26 +08:00
• 2b5f36d575 fix 杜建超 2020-09-22 11:33:51 +08:00
• 3096d7f37b fix 杜建超 2020-09-22 11:33:30 +08:00
• c4ca52bcf3 提交修改 quyixiao 2020-09-22 01:20:32 +08:00
• 546b964a1e 提交修改 quyixiao 2020-09-21 20:59:39 +08:00
• ca746a8804 提交修改 quyixiao 2020-09-21 18:51:14 +08:00
• 8f32cab62e 提交修改 quyixiao 2020-09-21 17:20:47 +08:00
• 5c31bba531 修复规格，品牌等管理相关接口 wulin 2020-09-21 17:05:19 +08:00
• 0f43b2697e 提交修改 quyixiao 2020-09-21 16:14:52 +08:00
• a43e44fed7 提交修改 quyixiao 2020-09-21 14:53:14 +08:00
• 3184452779 提交修改 quyixiao 2020-09-21 12:04:53 +08:00
• 804747f3e3 提交修改 quyixiao 2020-09-19 16:43:00 +08:00
• 7ae003d594 提交修改 quyixiao 2020-09-19 15:15:57 +08:00
• e28747425a 提交修改 quyixiao 2020-09-19 15:15:41 +08:00
• 2fd591162a fix 杜建超 2020-09-18 16:29:45 +08:00
• d5c055f819 提交修改 quyixiao 2020-09-18 16:10:57 +08:00
• 223bc63f9e fix 杜建超 2020-09-18 16:10:54 +08:00
• 66a22e6b08 提交修改 quyixiao 2020-09-18 16:07:52 +08:00
• 46c7ca8835 提交修改 quyixiao 2020-09-18 16:07:33 +08:00
• 94db997c59 Merge branch 'version_equipment_20200901' wulin 2020-09-16 08:49:28 +08:00
• 55236f6487 修改不验证条码打印接口 wulin 2020-09-16 08:49:03 +08:00
• 62da52343b 第几次盘点表增加equipment_前缀 wulin 2020-09-15 19:57:46 +08:00
• 8fb503ee2e 打开盘点记录 wulin 2020-09-15 19:52:31 +08:00
• 377b5be64c 提交修改 quyixiao 2020-09-15 15:47:56 +08:00
• a78df52829 完成移动端接口联调 wulin 2020-09-15 13:59:06 +08:00
• f7d9e3df7f Merge branch 'master' into version_report 杜建超 2020-09-15 10:15:46 +08:00
• d14f05bd3a fix 杜建超 2020-09-15 10:14:13 +08:00
• edd57e3f49 提交修改 quyixiao 2020-09-15 10:12:31 +08:00
• 3cb75b0b50 fix 杜建超 2020-09-14 17:42:37 +08:00
• 8871de88b3 fix 杜建超 2020-09-14 10:19:03 +08:00
• ad9b449f99 提交候tgit quyixiao 2020-09-10 10:52:52 +08:00
• e3edc8d751 部分修改 wulin 2020-09-10 09:30:52 +08:00
• 2e8a78b6ef 提交修改 quyixiao 2020-09-08 14:56:11 +08:00
• 1593b8bfc3 提交修改 quyixiao 2020-09-08 11:49:30 +08:00