 sxu
|
27e9c989b3
|
Merge branch 'dev-nwcc' into dev-nwcc-test
|
2024-07-23 16:18:19 +08:00 |
BianLzhaoMin
|
fc6b4366cc
|
Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc
|
2024-07-23 16:16:11 +08:00 |
|
BianLzhaoMin
|
b811e66339
|
部门管理新增添加公司功能
|
2024-07-23 16:16:04 +08:00 |
|
sxu
|
677dd59777
|
Merge branch 'dev-nwcc' into dev-nwcc-test
|
2024-07-23 14:24:00 +08:00 |
|
sxu
|
f816355ba3
|
多公司
|
2024-07-23 14:23:24 +08:00 |
|
BianLzhaoMin
|
5b27e5202f
|
优化项目启动时警告问题
|
2024-07-23 10:40:28 +08:00 |
|
sxu
|
962546f33f
|
for test
|
2024-07-19 09:34:00 +08:00 |
|
BianLzhaoMin
|
e9fa9c20cb
|
Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc
|
2024-07-18 18:17:52 +08:00 |
|
BianLzhaoMin
|
e6188797f6
|
优化密码校验
|
2024-07-18 18:17:48 +08:00 |
 15856
|
10e0169182
|
工地直转代码优化
|
2024-07-18 17:40:07 +08:00 |
|
15856
|
7b389d7632
|
优化sql语句，南网测试环境的mysql版本是5.7.21版本过低不支持递归函数
|
2024-07-18 14:27:01 +08:00 |
|
BianLzhaoMin
|
d6378da490
|
Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc
|
2024-07-18 11:17:46 +08:00 |
|
BianLzhaoMin
|
274837d9a4
|
优化页面字段
|
2024-07-18 11:17:40 +08:00 |
 mashuai
|
22965b6d73
|
bug修复
|
2024-07-18 11:11:10 +08:00 |
|
BianLzhaoMin
|
489085c3a8
|
优化导出等报错问题
|
2024-07-18 09:56:09 +08:00 |
|
BianLzhaoMin
|
74a9eb5e31
|
修改打包配置
|
2024-07-17 13:39:19 +08:00 |
|
BianLzhaoMin
|
ccf8482af8
|
优化大屏的打包配置
|
2024-07-17 10:59:52 +08:00 |
|
BianLzhaoMin
|
9ba6c13880
|
优化大屏的打包配置
|
2024-07-17 10:59:10 +08:00 |
|
BianLzhaoMin
|
0afc0cecb4
|
修改打包配置
|
2024-07-16 18:00:59 +08:00 |
|
BianLzhaoMin
|
5783dde87a
|
更改大屏跳转地址
|
2024-07-16 17:48:23 +08:00 |
|
sxu
|
a892071c5d
|
swagger代码还原，只需要使用nacos控制swagger
|
2024-07-16 14:34:10 +08:00 |
|
15856
|
032ca9a182
|
盘点入库问题修复
|
2024-07-16 14:27:45 +08:00 |
|
sxu
|
407551ad2a
|
Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc
|
2024-07-16 13:36:30 +08:00 |
|
sxu
|
a86ea3910b
|
代码生成问题
|
2024-07-16 13:36:04 +08:00 |
|
BianLzhaoMin
|
d35f8799ae
|
优化页面字段
|
2024-07-16 10:46:02 +08:00 |
|
BianLzhaoMin
|
54077911c4
|
优化新购图片上传问题
|
2024-07-16 09:50:09 +08:00 |
|
15856
|
ca3a671f2a
|
合并优化
|
2024-07-15 17:45:27 +08:00 |
|
15856
|
7acb95c487
|
合并优化
|
2024-07-15 17:15:20 +08:00 |
|
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 |