 sxu
|
08a2f2ad3c
|
bootstrap
|
2024-07-23 16:44:28 +08:00 |
|
sxu
|
9be455a286
|
多公司
|
2024-07-23 16:31:42 +08:00 |
|
sxu
|
962546f33f
|
for test
|
2024-07-19 09:34:00 +08:00 |
 15856
|
7acb95c487
|
合并优化
|
2024-07-15 17:15:20 +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 |
 liang.chao
|
ce5eecbaa8
|
测试问题代码体积
|
2024-06-24 14:05: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
|
79622b42a9
|
获取库管员接口修改
|
2024-06-12 09:10:45 +08:00 |
|
mashuai
|
7b6ae7623b
|
登录bug
|
2024-05-29 10:41:29 +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 |
|
15856
|
457d1cf846
|
支持多公司使用
|
2024-05-20 09:12:28 +08:00 |
liang.chao
|
bc8420e094
|
bug修改提交
|
2024-04-30 16:43:40 +08:00 |
|
15856
|
25f84100e6
|
bug修复
|
2024-04-30 14:32:17 +08:00 |
syruan
|
7cef74aa24
|
物资LOG日志修订
|
2024-04-29 16:50:07 +08:00 |
|
csyue
|
f94470a742
|
测试app问题项修改
|
2024-04-22 18:58:46 +08:00 |
|
sxu
|
ff93691d19
|
回滚错误提交
|
2024-04-20 14:29:59 +08:00 |
|
sxu
|
00a634cd0b
|
fix conflict
|
2024-04-20 14:21:17 +08:00 |
|
sxu
|
8f34479036
|
fix issue manage_type
|
2024-04-20 12:52:14 +08:00 |
|
syruan
|
4ba7fa1e04
|
物资LOG日志
|
2024-04-18 16:34:01 +08:00 |
|
liang.chao
|
c1d81433dd
|
获取当前用户所属公司
|
2024-04-07 13:17:18 +08:00 |
|
15856
|
6b800ad69e
|
短信通知换成腾讯sms
|
2024-04-03 16:40:38 +08:00 |
 hayu
|
c96e26c635
|
功能修复
|
2024-03-22 18:00:57 +08:00 |
|
liang.chao
|
3e32f0087d
|
bug修改
|
2024-03-22 17:38:48 +08:00 |
|
liang.chao
|
e2ce07dbd7
|
退料申请表数据问题修改
|
2024-03-21 11:29:39 +08:00 |
|
syruan
|
45d26cf0d4
|
逻辑优化，魔法值抽取，NULL异常处理，冗余装箱去除
|
2024-03-15 16:40:56 +08:00 |
1539530615@qq.com
|
a6065ec289
|
问题修改
|
2024-03-11 17:35:30 +08:00 |
|
liang.chao
|
3097ca3079
|
南网oss登录接口修改
|
2024-01-29 14:19:45 +08:00 |
|
liang.chao
|
bd16ff1485
|
单点登录处理
|
2024-01-27 11:03:18 +08:00 |
|
liang.chao
|
7c741a45af
|
线上bug修改
|
2024-01-25 14:11:30 +08:00 |
|
liang.chao
|
cffce178a3
|
登录日志增加用户昵称
|
2024-01-25 10:35:10 +08:00 |
|
liang.chao
|
76c079249f
|
配置更新
|
2024-01-22 20:03:01 +08:00 |
|
liang.chao
|
79361e219f
|
系统bug修改
|
2024-01-19 15:57:05 +08:00 |
|
bns_han
|
8dc5fc562c
|
功能完善
|
2024-01-16 17:09:48 +08:00 |
 dingjie
|
2a717dbea1
|
增加入库任务详细记录表
|
2023-12-24 00:13:14 +08:00 |
|
dingjie
|
a18aff4d23
|
新购模块代码修改
|
2023-12-22 19:14:59 +08:00 |
 liuchuan
|
0abdca2751
|
后台代码提交
|
2023-12-22 17:59:58 +08:00 |
 cwchen
|
d51ec0bbf3
|
统一下拉选-设备树添加company_id
|
2023-12-22 16:17:57 +08:00 |
|
dingjie
|
2380e9a695
|
配置文件修改
|
2023-12-21 20:29:12 +08:00 |
|
dingjie
|
1e77850c42
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-21 20:28:46 +08:00 |
|
dingjie
|
881b8b80df
|
新购验收模块
|
2023-12-21 20:28:01 +08:00 |
|
liuchuan
|
04bb0c890f
|
后台维修代码提交
|
2023-12-21 20:24:45 +08:00 |
|
cwchen
|
31ffacfc04
|
下拉选-设备类型树修改
|
2023-12-21 16:34:28 +08:00 |
|
cwchen
|
7d27c34072
|
下拉选修改
|
2023-12-21 16:24:46 +08:00 |
|
dingjie
|
debe5f88a2
|
文件上传大小限制修改
|
2023-12-21 14:13:03 +08:00 |
|
cwchen
|
4524eb173f
|
统一接口修改
|
2023-12-21 11:12:12 +08:00 |
|
cwchen
|
455ab5e30b
|
统一下拉选
|
2023-12-20 21:16:17 +08:00 |
|
cwchen
|
c6875f0f8b
|
下拉选
|
2023-12-20 18:09:46 +08:00 |