Commit Graph

1505 Commits

Author SHA1 Message Date
BianLzhaoMin c57c539f51 优化仓储管理菜单展示 2024-06-07 11:17:34 +08:00
binbin_pan f69ccc2b63 fix: 1453 退料审核时被驳回,驳回后修改数据再次提交,审核时查看的数据依然是驳回前的数据 2024-06-06 16:24:38 +08:00
BianLzhaoMin d5eec60eff 解决测试bug 2024-06-06 16:08:25 +08:00
binbin_pan a96647b29f 图形验证码问题 2024-06-06 15:54:54 +08:00
mashuai ff0d34952d Merge remote-tracking branch 'origin/dev-nw' into dev-nw 2024-06-06 15:52:18 +08:00
mashuai 147c10476f 短信过期时效,图形验证码缓存清理 2024-06-06 15:52:11 +08:00
binbin_pan db82be8297 明文加解密 2024-06-05 17:41:29 +08:00
mashuai 37e8761508 重置,修改加解密 2024-06-05 17:40:33 +08:00
mashuai a5e306a0f9 盘点入库详情 2024-06-05 14:32:17 +08:00
binbin_pan a790ba40e8 优化 2024-06-05 14:24:27 +08:00
binbin_pan f0a94ac0db 盘点入库-查看详情 2024-06-05 14:20:20 +08:00
mashuai 47831720ed 盘点入库详情 2024-06-05 14:06:45 +08:00
binbin_pan fd668b51ee 明文加解密 2024-06-05 14:01:33 +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
mashuai e8d364f707 Merge remote-tracking branch 'origin/dev-nw' into dev-nw 2024-06-05 10:48:17 +08:00
mashuai b8138072d4 修改重置加解密 2024-06-05 10:48:08 +08:00
binbin_pan 47cb821ccf 加解密 2024-06-05 10:43:30 +08:00
BianLzhaoMin 793d29c1ec Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq 2024-06-04 17:02:38 +08:00
BianLzhaoMin 55a471f328 修改打包配置,调试退料接收 2024-06-04 17:02:36 +08:00
15856 9df51c3993 重庆bug修复 2024-06-04 17:00:56 +08:00
赵福海 24b6c7be6e bug修复 2024-06-04 15:41:08 +08:00
binbin_pan bc2ee69dd7 解密初始密码 2024-06-04 14:01:19 +08:00
hayu 351bcbfb12 测试问题修改 2024-06-04 09:01:38 +08:00
BianLzhaoMin b1b42b9a78 优化列表序号,分页时延续问题 2024-06-03 11:10:25 +08:00
BianLzhaoMin e7e8c6da07 修改列表序号翻页时延续问题 2024-06-03 11:03:34 +08:00
BianLzhaoMin e908f0e2df 退料申请退料人手机号码问题优化 2024-06-03 09:49:25 +08:00
csyue 7690b80b6b 测试问题项修改 2024-05-31 15:26:47 +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
BianLzhaoMin a14014831a Merge branch 'dev-nw' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nw 2024-05-30 22:56:33 +08:00
BianLzhaoMin d33ca8df36 修改域名打包配置 2024-05-30 22:56:26 +08:00
mashuai e7067cf120 bug 2024-05-30 22:51:24 +08:00
BianLzhaoMin 31b0546225 优化登录页样式等问题 2024-05-30 18:14:29 +08:00
BianLzhaoMin 5354eff460 Merge branch 'dev-nw' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nw 2024-05-30 18:04:40 +08:00
BianLzhaoMin 05f15fcd5d 优化登录页面问题 2024-05-30 18:04:30 +08:00
mashuai 231c0c0ad4 去除图形验证码 2024-05-30 17:54:37 +08:00
mashuai eae0491788 仓储双因子 2024-05-30 00:49:03 +08:00
BianLzhaoMin a12ffea625 增加双因子校验问题 2024-05-29 23:21:56 +08:00
BianLzhaoMin ffa9ffd534 优化测试环境域名配置问题 2024-05-29 19:57:35 +08:00
BianLzhaoMin 3aec63eef9 优化新增用户时默认密码问题 2024-05-29 17:10:21 +08:00
BianLzhaoMin 7fb09c5166 更改新域名路径配置 2024-05-29 14:51:45 +08:00
mashuai 7b6ae7623b 登录bug 2024-05-29 10:41:29 +08:00
mashuai 713a0b6b0f bug 2024-05-28 11:00:53 +08:00
mashuai fab4e67b03 bug 2024-05-28 10:35:04 +08:00
BianLzhaoMin 5725afd23f Merge branch 'dev-nw' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nw 2024-05-27 16:14:35 +08:00
BianLzhaoMin 9bbc50a8f7 5.27 隐藏注册页面 2024-05-27 16:14:31 +08:00
mashuai d31e229b31 手机号次数限制 2024-05-27 16:08:27 +08:00