127 Commits

Author SHA1 Message Date
杜建超
00a30281e1 fix 2020-09-23 18:05:10 +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
wulin
22fb25d890 合并资产管理分支 2020-09-22 14:49:22 +08:00
wulin
0033e7a266 完成后台资产相关管理 2020-09-22 14:46:05 +08:00
杜建超
2b5f36d575 fix 2020-09-22 11:33:51 +08:00
杜建超
3096d7f37b fix 2020-09-22 11:33:30 +08:00
quyixiao
546b964a1e 提交修改 2020-09-21 20:59:39 +08:00
quyixiao
ca746a8804 提交修改 2020-09-21 18:51:14 +08:00
wulin
5c31bba531 修复规格,品牌等管理相关接口 2020-09-21 17:05:19 +08:00
quyixiao
0f43b2697e 提交修改 2020-09-21 16:14:52 +08:00
quyixiao
3184452779 提交修改 2020-09-21 12:04:53 +08:00
quyixiao
804747f3e3 提交修改 2020-09-19 16:43:00 +08:00
quyixiao
7ae003d594 提交修改 2020-09-19 15:15:57 +08:00
quyixiao
e28747425a 提交修改 2020-09-19 15:15:41 +08:00
quyixiao
d5c055f819 提交修改 2020-09-18 16:10:57 +08:00
杜建超
223bc63f9e fix 2020-09-18 16:10:54 +08:00
wulin
62da52343b 第几次盘点表增加equipment_前缀 2020-09-15 19:57:46 +08:00
wulin
8fb503ee2e 打开盘点记录 2020-09-15 19:52:31 +08:00
wulin
a78df52829 完成移动端接口联调 2020-09-15 13:59:06 +08:00
杜建超
f7d9e3df7f Merge branch 'master' into version_report 2020-09-15 10:15:46 +08:00
quyixiao
edd57e3f49 提交修改 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
wulin
e3edc8d751 部分修改 2020-09-10 09:30:52 +08:00
wulin
6ae9b4c897 Merge branch 'master' into version_equipment_20200901 2020-09-03 16:33:56 +08:00
quyixiao
1353e44ca9 提交修改 2020-09-03 16:21:19 +08:00
wulin
8293fa56ee 合并资产管理部分类 2020-09-03 14:24:24 +08:00
quyixiao
7fffd1c84c 提交修改 2020-09-01 18:38:56 +08:00
quyixiao
a444640a23 提交修改 2020-08-28 18:08:20 +08:00
quyixiao
93a6715af9 抢晒镜修改 2020-08-28 11:43:09 +08:00
quyixiao
c5bb74ebc7 提交修改 2020-08-26 17:27:07 +08:00
wulin
52af78c988 增加测试环境日志 2020-08-26 15:50:19 +08:00
quyixiao
f93210b175 提交人瞩 2020-08-26 10:41:07 +08:00
quyixiao
333f92eb2c 提交修改 2020-08-25 18:39:54 +08:00
quyixiao
8bfc81ede9 提交修改 2020-08-25 16:34:40 +08:00
quyixiao
03cf056bbd 提交修改 2020-08-25 16:33:49 +08:00
wulin
5ced3a2b9f Merge branch 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_1.0 2020-08-25 14:24:04 +08:00
wulin
097ceed2fa 增加token的code和codetime 2020-08-25 14:23:57 +08:00
quyixiao
dea0963688 提交修改 2020-08-24 19:58:40 +08:00
quyixiao
05504ac82b 提交修改 2020-08-24 19:58:10 +08:00
wulin
7404a4e2bb Merge branch 'version_1.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_1.0 2020-08-24 15:33:20 +08:00
wulin
65930df950 优化抽奖部分 2020-08-24 15:33:16 +08:00
quyixiao
960a326043 提交修改 2020-08-24 14:45:26 +08:00
quyixiao
89cbd71a7c 提交修改 2020-08-24 14:44:55 +08:00
wulin
e9a7f6a223 修改字段属性错误 2020-08-24 14:12:16 +08:00
wulin
9f6b9dc754 修复get set 2020-08-24 14:06:45 +08:00
wulin
a9bd1965de 修改活动编号为2 2020-08-24 13:50:07 +08:00
quyixiao
316e4f0d25 提交修改 2020-08-24 12:32:30 +08:00
quyixiao
acaecbba7b xxx 2020-08-24 12:30:13 +08:00