273 Commits

Author SHA1 Message Date
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
wulin
82d7d70881 提交修改 2020-09-25 19:28:37 +08:00
quyixiao
43e65443a0 提交修改 2020-09-24 11:33:09 +08:00
quyixiao
ea62b25c6b 提交修改 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
quyixiao
76e6dd840c 提交修改 2020-09-23 17:40:49 +08:00
quyixiao
8c9ca5f38c 提交修改 2020-09-23 16:52:46 +08:00
quyixiao
e8e7ad6f16 提交修改 2020-09-23 16:52:19 +08:00
wulin
e902f28d9a Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report 2020-09-23 16:07:40 +08:00
wulin
2d7172e991 盘点次数管理优化 2020-09-23 16:07:34 +08:00
quyixiao
735e53effb 提交修改 2020-09-23 15:15:18 +08:00
quyixiao
d13dbdc42d 提交修改 2020-09-23 11:22:40 +08:00
quyixiao
b4dc5b8210 提交修改 2020-09-23 10:58:48 +08:00
quyixiao
95ecea6fcc 提交修改 2020-09-22 17:55:22 +08:00
quyixiao
a6ef4bd937 提交修改 2020-09-22 17:08:26 +08:00
quyixiao
b89bd9b444 提交修改 2020-09-22 17:08:09 +08:00
wulin
9beeb333d1 去掉Shiro配置不验证资产管理接口 2020-09-22 17:05:05 +08:00
wulin
9d5c3c9fb8 Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report 2020-09-22 16:45:29 +08:00
wulin
2131e63ed1 钉钉免登增加判断是否离职 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
quyixiao
b031dba1ee 提交修改 2020-09-22 15:56:56 +08:00
wulin
22fb25d890 合并资产管理分支 2020-09-22 14:49:22 +08:00
wulin
0033e7a266 完成后台资产相关管理 2020-09-22 14:46:05 +08:00
杜建超
c097dca611 fix 2020-09-22 11:42:04 +08:00