liang.chao
|
20915ca52c
|
注册问题修改
|
2024-02-22 10:38:26 +08:00 |
|
liang.chao
|
98339ff568
|
退料审核通过
|
2024-02-21 20:22:34 +08:00 |
|
liang.chao
|
fc31e413c9
|
领料申请通过流程
|
2024-02-21 19:24:08 +08:00 |
zhouzy062
|
51d2ae84ca
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2024-02-21 18:28:49 +08:00 |
|
zhouzy062
|
ec04b2770e
|
新购验收机具配件验收入库驳回
|
2024-02-21 18:27:47 +08:00 |
 bns_han
|
12ef28f592
|
功能完善
|
2024-02-21 18:26:53 +08:00 |
|
bns_han
|
3474556833
|
功能完善
|
2024-02-20 18:09:36 +08:00 |
|
liang.chao
|
23bef43401
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-20 18:04:19 +08:00 |
|
liang.chao
|
5dd287a0b7
|
南网注册和领料数据权限修改
|
2024-02-20 18:04:13 +08:00 |
|
bns_han
|
2886d4946b
|
新购驳回
|
2024-02-20 14:01:15 +08:00 |
1539530615@qq.com
|
e900a0c3fe
|
领料申请代码提交
|
2024-02-20 13:57:26 +08:00 |
|
liang.chao
|
c4630625d3
|
领料申请通过和驳回逻辑修改
|
2024-02-19 17:48:42 +08:00 |
|
1539530615@qq.com
|
055ae63020
|
修饰管理代码提交
|
2024-02-18 17:59:38 +08:00 |
|
bns_han
|
82a3371114
|
综合查询--工程在用查询
|
2024-02-18 17:31:32 +08:00 |
|
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
|
9928bd19c5
|
南网oss注册接口修改
|
2024-02-01 13:40:08 +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 |
|
liang.chao
|
2a02ca8e88
|
南网oss登录接口修改
|
2024-01-31 14:09:49 +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 |
|
liang.chao
|
63a0d321ed
|
南网oss登录接口修改
|
2024-01-31 13:56:18 +08:00 |
|
liang.chao
|
bbdbfa8bb5
|
南网oss登录接口修改
|
2024-01-31 13:52:52 +08:00 |
|
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 |