BianLzhaoMin
|
081608c4b0
|
解决冲突
|
2024-07-15 11:22:34 +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 |
 binbin_pan
|
ee066b0495
|
动态配置大屏跳转地址
|
2024-06-19 10:02:46 +08:00 |
|
BianLzhaoMin
|
55a471f328
|
修改打包配置，调试退料接收
|
2024-06-04 17:02:36 +08:00 |
|
BianLzhaoMin
|
d33ca8df36
|
修改域名打包配置
|
2024-05-30 22:56:26 +08:00 |
|
BianLzhaoMin
|
31b0546225
|
优化登录页样式等问题
|
2024-05-30 18:14:29 +08:00 |
|
BianLzhaoMin
|
05f15fcd5d
|
优化登录页面问题
|
2024-05-30 18:04:30 +08:00 |
|
BianLzhaoMin
|
7fb09c5166
|
更改新域名路径配置
|
2024-05-29 14:51:45 +08:00 |
|
binbin_pan
|
b47c539b96
|
南网打包配置修改
|
2024-05-21 15:50:26 +08:00 |
|
BianLzhaoMin
|
f975ff3ec4
|
修改从前测试环境 端口
|
2024-05-11 10:15:25 +08:00 |
|
BianLzhaoMin
|
330447577a
|
优化
|
2024-04-25 17:48:06 +08:00 |
 zzyuan
|
ae327449a3
|
领退料问题修改
|
2024-04-20 10:23:04 +08:00 |
zhouzy062
|
2c9bf10d8f
|
前端上线代码优化
|
2024-04-08 09:01:54 +08:00 |
|
zhouzy062
|
eead748fae
|
宁夏打包发布0402
|
2024-04-02 16:02:22 +08:00 |
|
zhouzy062
|
546b65a536
|
前端代码修改，领料出库对接
|
2024-03-28 10:02:48 +08:00 |
|
zhouzy062
|
baebb94716
|
前端问题修改
|
2024-03-27 09:06:10 +08:00 |