Commit Graph

455 Commits

Author SHA1 Message Date
mashuai 0c0c5d9479 租赁推送 2024-07-30 10:45:56 +08:00
15856 432602333b 仓储推送到租赁平台 2024-07-29 17:37:08 +08:00
15856 c0aa735d29 仓储推送到租赁平台 2024-07-29 16:33:13 +08:00
15856 3c54729c87 仓储推送到租赁平台 2024-07-29 09:29:39 +08:00
liang.chao 00b9d01241 日期格式转换 2024-07-26 15:14:07 +08:00
liang.chao a5f1b1a391 数据推送功能 2024-07-25 15:19:35 +08:00
15856 c100796028 sonar代码异味修改 2024-07-24 16:29:04 +08:00
15856 5734099add sonar代码异味修改 2024-07-24 13:31:26 +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
sxu a892071c5d swagger代码还原,只需要使用nacos控制swagger 2024-07-16 14:34:10 +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 e732dd2a49 大屏页面调试 2024-07-04 15:41:32 +08:00
mashuai 8ae7cd430f 大屏二级页面调试 2024-07-04 15:22:46 +08:00
15856 08946fdb55 EIP导入功能 2024-06-21 14:20:01 +08:00
15856 2126401a08 支持多公司使用 2024-06-20 17:52:00 +08:00
csyue 92200848f0 二维码退料问题 2024-06-19 14:42:09 +08:00
csyue 74869937fe 重庆测试问题修改 2024-06-18 18:19:10 +08:00
csyue 245c841248 重庆测试问题修改 2024-06-14 17:28:18 +08:00
csyue f7bb700762 Merge remote-tracking branch 'origin/dev-cq' into dev-cq 2024-06-14 13:51:10 +08:00
csyue 5f5b7bccae 重庆测试问题修改 2024-06-14 13:50:59 +08:00
hayu dd94f1ee56 新购新增类型下拉框去重 2024-06-14 13:50:59 +08:00
csyue e5c4ad8c55 重庆测试问题修改 2024-06-14 13:42:46 +08:00
mashuai 2ba5872015 bug 2024-06-14 10:33:10 +08:00
mashuai 25210e04b6 bug 2024-06-13 17:56:24 +08:00
mashuai 3d6e880881 bug 2024-06-13 17:52:10 +08:00
hayu 9efc9ace5d 代码异味 2024-06-13 09:38:00 +08:00
csyue 79622b42a9 获取库管员接口修改 2024-06-12 09:10:45 +08:00
csyue 4db4ef2c65 获取维修人员接口修改 2024-06-12 09:03:58 +08:00
mashuai 5a96f46e6a bug 2024-06-11 11:19:51 +08:00
mashuai 2fa88dc1cd bug 2024-06-07 17:05:36 +08:00
csyue b6a404753b 重庆新购无法绑定编码问题修改 2024-06-07 13:29:51 +08:00
15856 9df51c3993 重庆bug修复 2024-06-04 17:00:56 +08:00
hayu 351bcbfb12 测试问题修改 2024-06-04 09:01:38 +08:00
csyue 7690b80b6b 测试问题项修改 2024-05-31 15:26:47 +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
liang.chao eafeddae64 代码提交 2024-05-16 13:37:16 +08:00
liang.chao 2c14888e0d 领料申请代码codeview 2024-05-10 15:22:15 +08:00
liang.chao ecdacc0143 领料管理列表展示问题提交 2024-05-10 11:06:49 +08:00
liang.chao 54d057f5b2 领料申请删除bug修改 2024-05-10 09:59:04 +08:00
liang.chao 7ef53ff9fe app退料接收无数据bug修改 2024-05-09 13:29:20 +08:00
mashuai eda8eac15d 权限 2024-05-08 18:43:46 +08:00
mashuai 99761fb49c 权限 2024-05-08 18:23:47 +08:00
liang.chao 2c20941d1a Merge remote-tracking branch 'origin/dev' into dev 2024-05-07 17:54:39 +08:00
liang.chao 00773c6bd0 领料出库详情查看接口修改 2024-05-07 17:54:30 +08:00
BianLzhaoMin f6c1bdb1c7 冲突合并 2024-05-07 16:38:53 +08:00
liang.chao 8b5519223f 测试问题bug修改 2024-05-07 16:29:36 +08:00
mashuai 75d2b02422 bug 2024-05-06 18:20:45 +08:00