liang.chao
|
ac5f82ea3f
|
新购器具绑定rfidCode
|
2024-02-18 17:19:56 +08:00 |
 bns_han
|
b0835e5473
|
功能完善
|
2024-02-18 11:10:28 +08:00 |
|
bns_han
|
1ef299d409
|
Merge remote-tracking branch 'origin/test' into dev
|
2024-02-18 10:55:08 +08:00 |
|
bns_han
|
ab4ba2cab8
|
功能完善
|
2024-02-18 10:50:30 +08:00 |
|
bns_han
|
26266f1399
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/GlobalConstants.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
|
2024-02-18 10:47:20 +08:00 |
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 |
zhouzy062
|
d801158d54
|
合并
|
2024-01-31 13:57:52 +08:00 |
|
zhouzy062
|
2ed5a78cec
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-01-31 13:57:12 +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 |
|
zhouzy062
|
c1dc8fe5ec
|
Merge branch 'dev' into test
|
2024-01-30 13:57:31 +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
|
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 |
|
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
|
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 |
|
bns_han
|
008bbc2f28
|
功能完善
|
2024-01-26 18:38:50 +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
|
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 |