Commit Graph

667 Commits

Author SHA1 Message Date
bns_han 70d0740213 Merge remote-tracking branch 'origin/dev' into dev 2024-01-30 10:14:10 +08:00
1539530615@qq.com 44e655e0b6 问题修改 2024-01-30 10:10:58 +08:00
bns_han 81a2ffd6ac 功能完善 2024-01-30 10:00:59 +08:00
zhouzy062 c8511a8e9d 前端问题修改 2024-01-30 09:16:55 +08:00
1539530615@qq.com e1dc6d5512 Merge branch 'dev' into test 2024-01-29 17:59:12 +08:00
1539530615@qq.com 2e4972279a 问题修改 2024-01-29 17:58:33 +08:00
1539530615@qq.com def6b77903 问题修改 2024-01-29 17:36:17 +08:00
1539530615@qq.com 50740168aa Merge branch 'dev' into test 2024-01-29 17:20:03 +08:00
liang.chao 9a47a636ab Merge branch 'dev' into test-sso
# Conflicts:
#	sgzb-ui/vue.config.js
2024-01-29 17:15:36 +08:00
1539530615@qq.com 21ad852102 维修问题修改 2024-01-29 17:11:02 +08:00
zhouzy062 3b67f59f88 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-01-29 17:08:44 +08:00
zhouzy062 9352a18f75 前端问题修改1.29 2024-01-29 17:08:39 +08:00
bns_han 9e133cacc4 功能完善 2024-01-29 16:51:39 +08:00
bns_han a5a1a16b28 功能完善 2024-01-29 16:49:57 +08:00
bns_han 173a44055f 功能完善 2024-01-29 16:01:02 +08:00
bns_han 8d8101441e 功能完善 2024-01-29 15:59:43 +08:00
bns_han dcb492aee6 功能完善 2024-01-29 15:59:30 +08:00
liang.chao ce827c20ac Merge remote-tracking branch 'origin/test-sso' into test-sso 2024-01-29 14:51:44 +08:00
liang.chao 154acc53ad 南网oss登录接口修改 2024-01-29 14:51:37 +08:00
zhouzy062 ea0bdba097 Merge branch 'test-sso' of http://192.168.0.56:3000/bonus/devicesmgt into test-sso 2024-01-29 14:34:37 +08:00
zhouzy062 ffa76924f2 接口变更 2024-01-29 14:34:31 +08:00
liang.chao 4fb8303ce1 南网oss登录接口修改 2024-01-29 14:31:17 +08:00
liang.chao f47ef8a004 Merge remote-tracking branch 'origin/test-sso' into test-sso 2024-01-29 14:19:55 +08:00
liang.chao 3097ca3079 南网oss登录接口修改 2024-01-29 14:19:45 +08:00
zhouzy062 14407d7f7e 南网登录 2024-01-29 10:21:25 +08:00
liang.chao 14238ce4e2 领料审核通过 2024-01-27 13:10:08 +08:00
liang.chao bd16ff1485 单点登录处理 2024-01-27 11:03:18 +08:00
zhouzy062 e1197aedc1 南网打包地址 2024-01-26 19:44:33 +08:00
zhouzy062 567732d51e 登陆前端代码 2024-01-26 19:11:15 +08:00
bns_han 008bbc2f28 功能完善 2024-01-26 18:38:50 +08:00
liang.chao ddae3a4261 Merge branch 'dev' into test-sso 2024-01-26 16:09:48 +08:00
liang.chao b8f6578230 领料审核通过 2024-01-26 16:07:44 +08:00
liang.chao b0105ff73f 领料审核通过 2024-01-26 15:59:51 +08:00
liang.chao 327460186d 领料审核通过 2024-01-26 13:12:18 +08:00
zhouzy062 70fe005e8d Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-01-26 13:08:02 +08:00
zhouzy062 1fd7600a81 修改问题提交 2024-01-26 13:07:02 +08:00
1539530615@qq.com 3ed2f429a8 Merge branch 'dev' into test 2024-01-26 13:04:22 +08:00
1539530615@qq.com 1839e0537c 报废审核驳回修改 2024-01-26 13:03:26 +08:00
bns_han 57130c2559 功能完善 2024-01-26 11:27:27 +08:00
liang.chao 7c741a45af 线上bug修改 2024-01-25 14:11:30 +08:00
1539530615@qq.com 83dd51fb1c Merge branch 'dev' into test 2024-01-25 13:16:35 +08:00
1539530615@qq.com e62aa0f71c 维修审核驳回修改 2024-01-25 13:16:01 +08:00
liang.chao cffce178a3 登录日志增加用户昵称 2024-01-25 10:35:10 +08:00
liang.chao 12c90475af 领料审核通过 2024-01-25 09:58:08 +08:00
liang.chao e0c1718699 Merge branch 'dev' into test 2024-01-24 19:32:59 +08:00
1539530615@qq.com 214b92688b 漏洞修改 2024-01-24 19:27:55 +08:00
liang.chao 38de5ca3fd Merge remote-tracking branch 'origin/test' into test 2024-01-24 18:45:10 +08:00
liang.chao 07ab9b64f1 Merge branch 'dev' into test 2024-01-24 18:44:39 +08:00
liang.chao b7f2c3ba4c 领料审核通过 2024-01-24 18:44:10 +08:00
bns_han 96020c4510 功能完善 2024-01-24 18:33:38 +08:00