Commit Graph

639 Commits

Author SHA1 Message Date
zhouzy062 79ce2d3ce2 前台提交 2024-01-31 13:51:10 +08:00
bns_han 1d2620e77f 代码规范 2024-01-31 11:28:01 +08:00
bns_han d0f151a77d 代码规范 2024-01-31 11:25:41 +08:00
bns_han 09f78ebecf Merge remote-tracking branch 'origin/dev' into dev 2024-01-30 17:35:13 +08:00
liang.chao 820e6dd77e 代码规范修改 2024-01-30 17:16:19 +08:00
liang.chao e920a9fd61 南网oss登录接口修改 2024-01-30 16:37:17 +08:00
liang.chao 1f52ede297 南网oss登录接口修改 2024-01-30 16:34:50 +08:00
liang.chao be66d0b7a1 Merge branch 'dev' into test-sso
# Conflicts:
#	sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java
2024-01-30 16:29:17 +08:00
liang.chao 586728fae3 南网oss登录接口修改 2024-01-30 16:28:46 +08:00
liang.chao 7fd7793893 Merge branch 'dev' into test-sso 2024-01-30 15:56:31 +08:00
liang.chao 6c75a099ef 南网oss登录接口修改 2024-01-30 15:55:55 +08:00
liang.chao 97341c2561 南网oss登录接口修改 2024-01-30 15:19:11 +08:00
liang.chao 713bc6ece2 Merge branch 'dev' into test-sso
# Conflicts:
#	sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
#	sgzb-ui/vue.config.js
2024-01-30 15:09:59 +08:00
liang.chao 451b56c0ba 南网oss登录接口修改 2024-01-30 15:06:15 +08:00
1539530615@qq.com bd6e623737 代码规范修改 2024-01-30 14:10:58 +08:00
bns_han 5def88a7d4 Merge remote-tracking branch 'origin/dev' into dev 2024-01-30 13:59:56 +08:00
zhouzy062 c1dc8fe5ec Merge branch 'dev' into test 2024-01-30 13:57:31 +08:00
liang.chao 13c82563b2 南网oss登录接口修改 2024-01-30 13:56:07 +08:00
1539530615@qq.com 8bf9558fc5 问题修改 2024-01-30 13:21:41 +08:00
zhouzy062 f737a289f5 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-01-30 10:50:29 +08:00
zhouzy062 101dd0e27d 前端配置 2024-01-30 10:50:26 +08:00
zhouzy062 2ff85222c6 登录接口对接 2024-01-30 10:35:06 +08:00
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