 sxu
|
a86ea3910b
|
代码生成问题
|
2024-07-16 13:36:04 +08:00 |
 15856
|
ca3a671f2a
|
合并优化
|
2024-07-15 17:45:27 +08:00 |
|
15856
|
7acb95c487
|
合并优化
|
2024-07-15 17:15:20 +08:00 |
|
15856
|
57d55bbab2
|
合并优化
|
2024-07-15 15:46:41 +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
|
86f70ad962
|
修改管理员名称
|
2024-07-03 10:56:24 +08:00 |
 liang.chao
|
ce5eecbaa8
|
测试问题代码体积
|
2024-06-24 14:05:00 +08:00 |
|
15856
|
08946fdb55
|
EIP导入功能
|
2024-06-21 14:20:01 +08:00 |
|
15856
|
2126401a08
|
支持多公司使用
|
2024-06-20 17:52:00 +08:00 |
 hayu
|
d958d0b775
|
新购
|
2024-06-20 09:07:29 +08:00 |
 csyue
|
92200848f0
|
二维码退料问题
|
2024-06-19 14:42:09 +08:00 |
|
csyue
|
afa141b7c6
|
Merge remote-tracking branch 'origin/dev-cq' into dev-cq
|
2024-06-19 14:41:34 +08:00 |
|
mashuai
|
d293205c43
|
退料审核bug
|
2024-06-19 13:59:19 +08:00 |
|
mashuai
|
4186260ef5
|
退料审核bug
|
2024-06-19 13:55:58 +08:00 |
|
csyue
|
8e18c4c351
|
Merge remote-tracking branch 'origin/dev-cq' into dev-cq
|
2024-06-18 18:20:29 +08:00 |
|
csyue
|
74869937fe
|
重庆测试问题修改
|
2024-06-18 18:19:10 +08:00 |
|
hayu
|
bc45f6bf07
|
综合服务中心导出功能修改
|
2024-06-18 17:42:02 +08:00 |
|
mashuai
|
43ca5391e7
|
退料审核bug
|
2024-06-18 17:38:08 +08:00 |
|
mashuai
|
e80849ec52
|
退料审核bug
|
2024-06-18 16:23:47 +08:00 |
|
hayu
|
986013197c
|
代码异味
|
2024-06-14 18:04:40 +08:00 |
|
csyue
|
245c841248
|
重庆测试问题修改
|
2024-06-14 17:28:18 +08:00 |
|
csyue
|
a6497fcc2c
|
重庆测试问题修改
|
2024-06-14 16:31:45 +08:00 |
|
hayu
|
1fd3565c51
|
新购时间筛选修改
|
2024-06-14 15:14:34 +08:00 |
|
mashuai
|
9cd15963dd
|
bug
|
2024-06-14 14:58:11 +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 |
|
mashuai
|
25469976a4
|
乱码bug
|
2024-06-13 14:44:59 +08:00 |
|
mashuai
|
926c07a059
|
乱码bug
|
2024-06-13 14:44:15 +08:00 |
|
mashuai
|
f0157d9563
|
乱码bug
|
2024-06-13 14:42:47 +08:00 |
|
hayu
|
9efc9ace5d
|
代码异味
|
2024-06-13 09:38:00 +08:00 |
|
mashuai
|
2d4c0cb34f
|
bug优化
|
2024-06-12 18:20:02 +08:00 |
|
mashuai
|
cf8e5eac70
|
bug优化
|
2024-06-12 18:17:28 +08:00 |
|
csyue
|
39f3988079
|
修饰入库审核库管员返回
|
2024-06-12 17:48:54 +08:00 |
|
csyue
|
c0e7bf8d7c
|
Merge remote-tracking branch 'origin/dev-cq' into dev-cq
|
2024-06-12 17:44:16 +08:00 |
|
csyue
|
a159464dfc
|
领料审核增加任务状态筛选
|
2024-06-12 17:43:04 +08:00 |
|
mashuai
|
b19c374c54
|
入库盘点
|
2024-06-12 13:51:52 +08:00 |
|
mashuai
|
bfbb2bba31
|
入库盘点
|
2024-06-12 13:46:55 +08:00 |
|
csyue
|
79622b42a9
|
获取库管员接口修改
|
2024-06-12 09:10:45 +08:00 |
|
csyue
|
4db4ef2c65
|
获取维修人员接口修改
|
2024-06-12 09:03:58 +08:00 |
|
mashuai
|
15feec4e84
|
图形验证码重置处理
|
2024-06-11 16:25:22 +08:00 |
|
mashuai
|
5a96f46e6a
|
bug
|
2024-06-11 11:19:51 +08:00 |
|
mashuai
|
2fa88dc1cd
|
bug
|
2024-06-07 17:05:36 +08:00 |
|
csyue
|
b6a404753b
|
重庆新购无法绑定编码问题修改
|
2024-06-07 13:29:51 +08:00 |