BianLzhaoMin
|
e38925a0cc
|
Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc
|
2024-07-15 16:03:55 +08:00 |
|
BianLzhaoMin
|
e0487ad332
|
优化字典页面新增 删除问题
|
2024-07-15 16:03:51 +08:00 |
 15856
|
57d55bbab2
|
合并优化
|
2024-07-15 15:46:41 +08:00 |
|
BianLzhaoMin
|
3bac5f119a
|
解决打包报错问题
|
2024-07-15 11:26:34 +08:00 |
|
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
|
89f3c6f39c
|
IOT设备管理联调
|
2024-07-11 18:33:09 +08:00 |
|
binbin_pan
|
40eb75962a
|
数据推送
|
2024-07-10 17:23:54 +08:00 |
|
binbin_pan
|
aa9aac7459
|
数据推送
|
2024-07-09 17:06:32 +08:00 |
|
binbin_pan
|
8eea5b7ad4
|
数据推送
|
2024-07-08 18:08:41 +08:00 |
|
binbin_pan
|
36c5b6eecc
|
推送租赁
|
2024-07-05 16:48:26 +08:00 |
|
15856
|
b6859923de
|
Merge remote-tracking branch 'origin/dev-nw' into dev-nw
|
2024-07-05 13:05:36 +08:00 |
|
15856
|
fd39dad8b7
|
sonar异味优化
|
2024-07-05 13:05:28 +08:00 |
|
binbin_pan
|
b551fe3475
|
领料出库-定位页面+推送
|
2024-07-05 11:00:28 +08:00 |
 mashuai
|
e732dd2a49
|
大屏页面调试
|
2024-07-04 15:41:32 +08:00 |
|
mashuai
|
8ae7cd430f
|
大屏二级页面调试
|
2024-07-04 15:22:46 +08:00 |
|
binbin_pan
|
d04f23454b
|
定位页面开发
|
2024-07-03 20:05:33 +08:00 |
|
binbin_pan
|
6adb1dc728
|
定位页面搭建
|
2024-07-03 17:10:50 +08:00 |
|
binbin_pan
|
22ec75cbf2
|
定位页面搭建
|
2024-07-03 11:04:35 +08:00 |
|
mashuai
|
be9bf06127
|
test
|
2024-07-03 11:00:13 +08:00 |
|
15856
|
86f70ad962
|
修改管理员名称
|
2024-07-03 10:56:24 +08:00 |
|
mashuai
|
9d15f5a267
|
test
|
2024-07-02 19:04:52 +08:00 |
|
mashuai
|
ccd4e80ba0
|
test
|
2024-07-02 18:59:06 +08:00 |
|
binbin_pan
|
9adc2a5528
|
IOT设备管理页面搭建
|
2024-07-02 17:59:58 +08:00 |
 hayu
|
8a053e86e9
|
通知公告及用户管理问题修改
|
2024-06-28 15:17:00 +08:00 |
|
binbin_pan
|
38e7330b04
|
fix: 2216 添加通知人员时，人员序号混乱
|
2024-06-28 09:47:10 +08:00 |
|
binbin_pan
|
237df25eb6
|
fix: 2214 角色管理中分配用户有缓存问题
|
2024-06-28 09:38:53 +08:00 |
 liang.chao
|
ce5eecbaa8
|
测试问题代码体积
|
2024-06-24 14:05:00 +08:00 |
|
BianLzhaoMin
|
684f41e399
|
Merge branch 'dev-nw' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nw
|
2024-06-21 14:31:28 +08:00 |
|
BianLzhaoMin
|
bf1123f732
|
增加标段工程导入功能
|
2024-06-21 14:31:24 +08:00 |
|
15856
|
53dac4eee8
|
Merge remote-tracking branch 'origin/dev-nw' into dev-nw
|
2024-06-21 14:20:13 +08:00 |
|
15856
|
08946fdb55
|
EIP导入功能
|
2024-06-21 14:20:01 +08:00 |
|
15856
|
2126401a08
|
支持多公司使用
|
2024-06-20 17:52:00 +08:00 |
|
BianLzhaoMin
|
75111c0ec0
|
增加导入功能
|
2024-06-20 14:49:04 +08:00 |
|
binbin_pan
|
d915b9056a
|
优化
|
2024-06-20 13:47:15 +08:00 |
|
BianLzhaoMin
|
87daec20aa
|
组件同步
|
2024-06-20 13:40:57 +08:00 |
|
BianLzhaoMin
|
ba4400a0fc
|
组件同步
|
2024-06-20 13:31:51 +08:00 |
|
BianLzhaoMin
|
87698622cd
|
增加配置组件
|
2024-06-20 13:28:34 +08:00 |
|
BianLzhaoMin
|
e1ca6fdde4
|
代码同步（领退料，仓储管理）
|
2024-06-20 13:24:44 +08:00 |
|
BianLzhaoMin
|
cd1117c199
|
测试
|
2024-06-20 13:19:57 +08:00 |
|
hayu
|
d958d0b775
|
新购
|
2024-06-20 09:07:29 +08:00 |
|
mashuai
|
e40741b038
|
test
|
2024-06-19 16:09:17 +08:00 |
|
BianLzhaoMin
|
771e755198
|
Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq
|
2024-06-19 14:43:01 +08:00 |
|
BianLzhaoMin
|
b4b8a79df0
|
优化首页查看跳转报错问题
|
2024-06-19 14:42:17 +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 |
|
binbin_pan
|
d6e6d0deef
|
优化序号问题
|
2024-06-19 11:06:10 +08:00 |
|
BianLzhaoMin
|
c82f214e93
|
Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq
|
2024-06-19 10:40:45 +08:00 |