 15856
|
3c54729c87
|
仓储推送到租赁平台
|
2024-07-29 09:29:39 +08:00 |
 sxu
|
08a2f2ad3c
|
bootstrap
|
2024-07-23 16:44:28 +08:00 |
|
sxu
|
962546f33f
|
for test
|
2024-07-19 09:34:00 +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
|
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 |
|
mashuai
|
e40741b038
|
test
|
2024-06-19 16:09:17 +08:00 |
|
mashuai
|
15feec4e84
|
图形验证码重置处理
|
2024-06-11 16:25:22 +08:00 |
|
mashuai
|
338d1e6a20
|
bug
|
2024-06-11 13:15:03 +08:00 |
|
mashuai
|
6020a1929d
|
注释注册接口
|
2024-06-07 17:14:57 +08:00 |
|
mashuai
|
147c10476f
|
短信过期时效，图形验证码缓存清理
|
2024-06-06 15:52:11 +08:00 |
|
mashuai
|
82d80aa1b7
|
重庆用户加解密
|
2024-06-05 13:42:32 +08:00 |
|
mashuai
|
a5f7806154
|
重庆用户加解密
|
2024-06-05 13:37:52 +08:00 |
 csyue
|
84299f69af
|
宁夏试运行问题修改
|
2024-06-05 13:30:17 +08:00 |
|
赵福海
|
0000bf3752
|
Merge remote-tracking branch 'origin/dev' into dev-cq
# Conflicts:
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SavePutInfoDto.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java
# sgzb-ui/package.json
# sgzb-ui/prettier.config.js
# sgzb-ui/src/router/index.js
# sgzb-ui/src/utils/request.js
# sgzb-ui/src/views/base/comeAndGo/index.vue
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
# sgzb-ui/src/views/login.vue
# sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
# sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
# sgzb-ui/src/views/store/tools/keeper.vue
# sgzb-ui/src/views/system/user/index.vue
# sgzb-ui/vue.config.js
|
2024-05-31 15:19:38 +08:00 |
|
mashuai
|
c350486773
|
Revert "bug"
This reverts commit 4c83705ab1.
|
2024-05-31 11:22:35 +08:00 |
|
mashuai
|
4c83705ab1
|
bug
|
2024-05-31 11:19:06 +08:00 |
|
mashuai
|
e7067cf120
|
bug
|
2024-05-30 22:51:24 +08:00 |
|
mashuai
|
231c0c0ad4
|
去除图形验证码
|
2024-05-30 17:54:37 +08:00 |
|
mashuai
|
eae0491788
|
仓储双因子
|
2024-05-30 00:49:03 +08:00 |
|
mashuai
|
713a0b6b0f
|
bug
|
2024-05-28 11:00:53 +08:00 |
|
mashuai
|
fab4e67b03
|
bug
|
2024-05-28 10:35:04 +08:00 |
|
mashuai
|
d31e229b31
|
手机号次数限制
|
2024-05-27 16:08:27 +08:00 |
|
mashuai
|
32b80e0d6c
|
手机号次数限制
|
2024-05-27 15:52:20 +08:00 |
|
mashuai
|
4db960c1d6
|
盘点入库,用户加解密
|
2024-05-25 16:28:54 +08:00 |
|
mashuai
|
1c935c5395
|
用户加解密
|
2024-05-24 19:13:17 +08:00 |
|
mashuai
|
eaecddaae6
|
nacos
|
2024-05-23 21:39:32 +08:00 |
|
mashuai
|
9d2d1bb152
|
用户加密漏洞
|
2024-05-23 19:48:15 +08:00 |
|
mashuai
|
513ac105c8
|
用户加密漏洞
|
2024-05-23 19:26:58 +08:00 |
|
mashuai
|
772aad308d
|
用户加密漏洞
|
2024-05-22 16:45:04 +08:00 |
|
mashuai
|
9c99ea247d
|
用户加密漏洞
|
2024-05-22 16:42:09 +08:00 |
|
mashuai
|
8e09caf346
|
SpringBootActuator接口未授权多环境漏洞修复
|
2024-05-22 16:21:10 +08:00 |
|
csyue
|
f94470a742
|
测试app问题项修改
|
2024-04-22 18:58:46 +08:00 |
syruan
|
77c740164c
|
物资LOG日志
|
2024-04-12 16:19:28 +08:00 |
|
syruan
|
035de35c26
|
移动端token策略处理
|
2024-04-08 15:08:12 +08:00 |
liang.chao
|
696380cec6
|
bug修改
|
2024-03-26 17:31:06 +08:00 |
|
csyue
|
d16be6ca46
|
int同类型比较
|
2024-03-26 13:52:19 +08:00 |
|
liang.chao
|
d0d13039d6
|
工地直转
|
2024-03-12 13:52:31 +08:00 |
|
liang.chao
|
32b9538771
|
退料审核通过和驳回逻辑提交
|
2024-02-29 19:24:27 +08:00 |
|
liang.chao
|
a658f82915
|
rfid绑定和注册配置默认角色
|
2024-02-28 13:52:12 +08:00 |
|
liang.chao
|
3878c5a23f
|
退料申请表数据问题修改
|
2024-02-27 18:06:01 +08:00 |
|
liang.chao
|
201f7d4f5c
|
商城登录接口
|
2024-02-27 16:31:38 +08:00 |
|
liang.chao
|
5b0e807b29
|
退料申请表数据问题修改
|
2024-02-27 16:02:01 +08:00 |
|
liang.chao
|
20915ca52c
|
注册问题修改
|
2024-02-22 10:38:26 +08:00 |
|
liang.chao
|
fc31e413c9
|
领料申请通过流程
|
2024-02-21 19:24:08 +08:00 |
|
liang.chao
|
5dd287a0b7
|
南网注册和领料数据权限修改
|
2024-02-20 18:04:13 +08:00 |
|
liang.chao
|
9928bd19c5
|
南网oss注册接口修改
|
2024-02-01 13:40:08 +08:00 |
|
liang.chao
|
2a02ca8e88
|
南网oss登录接口修改
|
2024-01-31 14:09:49 +08:00 |