Commit Graph

98 Commits

Author SHA1 Message Date
liang.chao 23e4885815 结算管理功能开发 2024-08-06 15:44:16 +08:00
mashuai 94552bc1b1 配置文件数据库和redis账号密码加密 2024-07-30 09:45:33 +08:00
sxu 851f419cc2 deploy 2024-07-24 09:47:19 +08:00
liang.chao ea19ecccc0 端口修改 2024-07-22 13:52:47 +08:00
sxu 3273e4ba9c deploy 2024-07-19 14:31:53 +08:00
liang.chao ce5eecbaa8 测试问题代码体积 2024-06-24 14:05:00 +08:00
mashuai cf8e5eac70 bug优化 2024-06-12 18:17:28 +08:00
csyue 79622b42a9 获取库管员接口修改 2024-06-12 09:10:45 +08:00
mashuai a5f7806154 重庆用户加解密 2024-06-05 13:37:52 +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 32b80e0d6c 手机号次数限制 2024-05-27 15:52:20 +08:00
mashuai 4db960c1d6 盘点入库,用户加解密 2024-05-25 16:28:54 +08:00
15856 d92af0df79 导出预报废审核列表 2024-05-07 11:02:36 +08:00
15856 40736e1c85 催办,退料报废,维修报废,预报废审核,报废审核 2024-05-06 10:35:08 +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
liang.chao d293399415 成套机具代码提交 2024-04-25 16:30:04 +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 bbc9032b70 fix issue manage_type 2024-04-20 12:52:19 +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
syruan 77c740164c 物资LOG日志 2024-04-12 16:19:28 +08:00
mashuai 5c1bf635a8 fix 2024-04-10 16:08:19 +08:00
15856 033f4ba75f 回退短信和文件上传 2024-04-07 16:23:09 +08:00
15856 ffa3c54014 上传换成腾讯的cos 2024-04-07 15:58:14 +08:00
liang.chao c1d81433dd 获取当前用户所属公司 2024-04-07 13:17:18 +08:00
liang.chao 902c5015ac bug提交 2024-04-03 17:20:33 +08:00
15856 a2cc2bb7c6 短信通知换成腾讯sms 2024-04-03 16:47:18 +08:00
15856 6b800ad69e 短信通知换成腾讯sms 2024-04-03 16:40:38 +08:00
liang.chao f42e2210ba bug修改 2024-03-25 15:24:02 +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
liang.chao c5475985b9 退料申请表数据问题修改 2024-03-14 09:09:03 +08:00
1539530615@qq.com a6065ec289 问题修改 2024-03-11 17:35:30 +08:00
liang.chao a658f82915 rfid绑定和注册配置默认角色 2024-02-28 13:52:12 +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 c4630625d3 领料申请通过和驳回逻辑修改 2024-02-19 17:48:42 +08:00
liang.chao e9b0dbd68c Merge branch 'dev' into test-sso 2024-02-01 13:26:45 +08:00
bns_han d0f151a77d 代码规范 2024-01-31 11:25:41 +08:00
liang.chao 713bc6ece2 Merge branch 'dev' into test-sso
# Conflicts:
#	sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
#	sgzb-ui/vue.config.js
2024-01-30 15:09:59 +08:00
1539530615@qq.com bd6e623737 代码规范修改 2024-01-30 14:10:58 +08:00
liang.chao 3097ca3079 南网oss登录接口修改 2024-01-29 14:19:45 +08:00
liang.chao 14238ce4e2 领料审核通过 2024-01-27 13:10:08 +08:00
liang.chao bd16ff1485 单点登录处理 2024-01-27 11:03:18 +08:00