 sxu
|
962546f33f
|
for test
|
2024-07-19 09:34:00 +08:00 |
 15856
|
a8097987df
|
Merge remote-tracking branch 'origin/dev-nw' into dev-nwcc
# Conflicts:
# sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/utils/RsaUtil.java
# sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
# sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/config/RsaUtil.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysConfigController.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java
# sgzb-ui/package.json
# sgzb-ui/src/api/claimAndRefund/return.js
# sgzb-ui/src/router/index.js
# sgzb-ui/src/store/modules/user.js
# sgzb-ui/src/utils/globalUrl.js
# sgzb-ui/src/views/base/section/index.vue
# sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
# sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
# sgzb-ui/src/views/index.vue
# sgzb-ui/src/views/oldLogin.vue
# sgzb-ui/src/views/resetPassword.vue
# sgzb-ui/src/views/system/config/index.vue
# sgzb-ui/src/views/system/user/index.vue
# sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
# sgzb-ui/vue.config.js
|
2024-07-15 10:21:48 +08:00 |
 mashuai
|
e732dd2a49
|
大屏页面调试
|
2024-07-04 15:41:32 +08:00 |
|
mashuai
|
8ae7cd430f
|
大屏二级页面调试
|
2024-07-04 15:22:46 +08:00 |
|
15856
|
08946fdb55
|
EIP导入功能
|
2024-06-21 14:20:01 +08:00 |
 csyue
|
92200848f0
|
二维码退料问题
|
2024-06-19 14:42:09 +08:00 |
|
csyue
|
f7bb700762
|
Merge remote-tracking branch 'origin/dev-cq' into dev-cq
|
2024-06-14 13:51:10 +08:00 |
|
csyue
|
5f5b7bccae
|
重庆测试问题修改
|
2024-06-14 13:50:59 +08:00 |
 hayu
|
dd94f1ee56
|
新购新增类型下拉框去重
|
2024-06-14 13:50:59 +08:00 |
|
csyue
|
e5c4ad8c55
|
重庆测试问题修改
|
2024-06-14 13:42:46 +08:00 |
|
mashuai
|
2ba5872015
|
bug
|
2024-06-14 10:33:10 +08:00 |
|
mashuai
|
25210e04b6
|
bug
|
2024-06-13 17:56:24 +08:00 |
|
mashuai
|
3d6e880881
|
bug
|
2024-06-13 17:52:10 +08:00 |
|
csyue
|
79622b42a9
|
获取库管员接口修改
|
2024-06-12 09:10:45 +08:00 |
|
csyue
|
4db4ef2c65
|
获取维修人员接口修改
|
2024-06-12 09:03:58 +08:00 |
|
mashuai
|
5a96f46e6a
|
bug
|
2024-06-11 11:19:51 +08:00 |
|
mashuai
|
2fa88dc1cd
|
bug
|
2024-06-07 17:05:36 +08:00 |
|
hayu
|
351bcbfb12
|
测试问题修改
|
2024-06-04 09:01:38 +08:00 |
|
mashuai
|
eaecddaae6
|
nacos
|
2024-05-23 21:39:32 +08:00 |
|
mashuai
|
9d2d1bb152
|
用户加密漏洞
|
2024-05-23 19:48:15 +08:00 |
|
mashuai
|
8e09caf346
|
SpringBootActuator接口未授权多环境漏洞修复
|
2024-05-22 16:21:10 +08:00 |
liang.chao
|
eafeddae64
|
代码提交
|
2024-05-16 13:37:16 +08:00 |
|
liang.chao
|
7ef53ff9fe
|
app退料接收无数据bug修改
|
2024-05-09 13:29:20 +08:00 |
|
mashuai
|
99761fb49c
|
权限
|
2024-05-08 18:23:47 +08:00 |
|
liang.chao
|
2c20941d1a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-05-07 17:54:39 +08:00 |
|
liang.chao
|
00773c6bd0
|
领料出库详情查看接口修改
|
2024-05-07 17:54:30 +08:00 |
BianLzhaoMin
|
f6c1bdb1c7
|
冲突合并
|
2024-05-07 16:38:53 +08:00 |
|
liang.chao
|
8b5519223f
|
测试问题bug修改
|
2024-05-07 16:29:36 +08:00 |
|
mashuai
|
75d2b02422
|
bug
|
2024-05-06 18:20:45 +08:00 |
|
liang.chao
|
0cce5cc793
|
退料审核代码提交
|
2024-05-06 17:07:03 +08:00 |
|
BianLzhaoMin
|
688599a5b0
|
宁夏 冲突合并
|
2024-05-06 09:48:15 +08:00 |
|
15856
|
834faeee43
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 17:51:44 +08:00 |
|
mashuai
|
1ed94a6706
|
bug
|
2024-04-30 15:14:27 +08:00 |
|
liang.chao
|
1030c78305
|
app领料申请详情bug提交
|
2024-04-30 14:09:40 +08:00 |
|
15856
|
1419b8c32d
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 13:11:10 +08:00 |
|
mashuai
|
f23b73106a
|
bug
|
2024-04-30 11:29:00 +08:00 |
|
liang.chao
|
6b002958d6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-30 11:23:54 +08:00 |
|
liang.chao
|
ffe7c67c6f
|
重庆领料审核修改后无数据bug
|
2024-04-30 11:23:49 +08:00 |
|
mashuai
|
d1ed28a088
|
bug
|
2024-04-29 17:42:02 +08:00 |
|
mashuai
|
d58c1b788d
|
bug
|
2024-04-29 16:52:51 +08:00 |
|
mashuai
|
4f9cb5e37e
|
宁夏大屏二级页面
|
2024-04-29 14:38:15 +08:00 |
|
liang.chao
|
c2aaa44f1b
|
app联调代码提交
|
2024-04-28 16:16:29 +08:00 |
|
liang.chao
|
bf0992137d
|
成套机具和退料申请当前在用量代码提交
|
2024-04-26 17:00:29 +08:00 |
|
15856
|
5051b6ae92
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-25 16:47:32 +08:00 |
|
15856
|
14822542ce
|
Bug修复
|
2024-04-25 16:43:56 +08:00 |
|
15856
|
090fc6c17d
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-25 16:42:58 +08:00 |
|
liang.chao
|
d293399415
|
成套机具代码提交
|
2024-04-25 16:30:04 +08:00 |
|
mashuai
|
ff893914d9
|
bug修改
|
2024-04-25 14:51:11 +08:00 |
|
mashuai
|
62aeaf6cfd
|
bug修改
|
2024-04-25 13:08:53 +08:00 |
|
liang.chao
|
3ac38557af
|
成套机具代码提交
|
2024-04-24 17:59:17 +08:00 |