Commit Graph

365 Commits

Author SHA1 Message Date
1539530615@qq.com 0b5bc3ec52 修饰管理代码提交 2024-02-18 09:36:59 +08:00
liang.chao e9b0dbd68c Merge branch 'dev' into test-sso 2024-02-01 13:26:45 +08:00
liang.chao 71e0bc45e5 RFID编码入库 2024-02-01 10:42:01 +08:00
bns_han 87ef699f84 新购驳回 2024-02-01 10:00:10 +08:00
bns_han 49b4ae203b 代码规范 2024-01-31 14:10:59 +08:00
bns_han 1d2620e77f 代码规范 2024-01-31 11:28:01 +08:00
bns_han d0f151a77d 代码规范 2024-01-31 11:25:41 +08:00
liang.chao 820e6dd77e 代码规范修改 2024-01-30 17:16:19 +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 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
1539530615@qq.com 8bf9558fc5 问题修改 2024-01-30 13:21:41 +08:00
1539530615@qq.com 44e655e0b6 问题修改 2024-01-30 10:10:58 +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
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
bns_han 9e133cacc4 功能完善 2024-01-29 16:51:39 +08:00
bns_han 173a44055f 功能完善 2024-01-29 16:01:02 +08:00
liang.chao 3097ca3079 南网oss登录接口修改 2024-01-29 14:19:45 +08:00
liang.chao 14238ce4e2 领料审核通过 2024-01-27 13:10:08 +08:00
liang.chao bd16ff1485 单点登录处理 2024-01-27 11:03:18 +08:00
liang.chao b8f6578230 领料审核通过 2024-01-26 16:07:44 +08:00
liang.chao 327460186d 领料审核通过 2024-01-26 13:12:18 +08:00
1539530615@qq.com 1839e0537c 报废审核驳回修改 2024-01-26 13:03:26 +08:00
liang.chao 7c741a45af 线上bug修改 2024-01-25 14:11:30 +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
1539530615@qq.com 214b92688b 漏洞修改 2024-01-24 19:27:55 +08:00
bns_han 96020c4510 功能完善 2024-01-24 18:33:38 +08:00
1539530615@qq.com 24c927baa2 维修审核修改 2024-01-24 18:23:16 +08:00
1539530615@qq.com f8e8651894 维修修改 2024-01-24 16:13:32 +08:00
liang.chao 96b479c2f8 pom打包提交 2024-01-24 14:48:24 +08:00
1539530615@qq.com b0ab60c20f 维修修改 2024-01-24 14:39:17 +08:00
1539530615@qq.com 7370cab29a 维修修改 2024-01-24 14:19:18 +08:00
bns_han 367ad3f33e Merge remote-tracking branch 'origin/test' into dev 2024-01-24 11:30:37 +08:00
bns_han 382bc7b6f3 功能完善 2024-01-24 11:29:30 +08:00
1539530615@qq.com f20bb2ee9b 试验检验审核驳回修改 2024-01-24 11:16:21 +08:00
bns_han fdb6a9e329 功能完善 2024-01-24 09:59:58 +08:00
bns_han 61c5472b16 功能完善 2024-01-23 21:08:23 +08:00
1539530615@qq.com d595a6b80a 试验检验审核驳回修改 2024-01-23 21:07:13 +08:00
liang.chao 88e5c4a21c 头像上传 2024-01-23 16:09:25 +08:00
1539530615@qq.com be37865f2d 工机具图片上传修改 2024-01-23 13:47:10 +08:00
liang.chao bfd206a0b2 代码规范提交 2024-01-23 09:32:21 +08:00
1539530615@qq.com ffbe56adb5 app按钮修改 2024-01-23 09:20:54 +08:00