 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 |
 binbin_pan
|
a790ba40e8
|
优化
|
2024-06-05 14:24:27 +08:00 |
|
binbin_pan
|
fd668b51ee
|
明文加解密
|
2024-06-05 14:01:33 +08:00 |
BianLzhaoMin
|
55a471f328
|
修改打包配置，调试退料接收
|
2024-06-04 17:02:36 +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 |
|
BianLzhaoMin
|
a12ffea625
|
增加双因子校验问题
|
2024-05-29 23:21:56 +08:00 |
|
BianLzhaoMin
|
3aec63eef9
|
优化新增用户时默认密码问题
|
2024-05-29 17:10:21 +08:00 |
|
binbin_pan
|
ed2ce0952a
|
密码明文加密
|
2024-05-24 19:08:41 +08:00 |
|
binbin_pan
|
abcb736322
|
密码明文加密
|
2024-05-24 19:04:39 +08:00 |
|
binbin_pan
|
1e9479a9d6
|
密码加密+增加密码重置页
|
2024-05-24 09:35:06 +08:00 |
|
binbin_pan
|
db95f3fa4b
|
南网env环境变量变更
|
2024-05-24 09:12:44 +08:00 |
|
binbin_pan
|
c63284ee05
|
增加初始密码登录后重置初始密码页
|
2024-05-23 17:43:32 +08:00 |
|
binbin_pan
|
68c2cd6097
|
fix: 用户密码明文传输漏洞
|
2024-05-22 15:20:05 +08:00 |
|
binbin_pan
|
4ce7ad39fd
|
fix: 用户密码明文传输漏洞
|
2024-05-22 15:18:21 +08:00 |
|
BianLzhaoMin
|
aaedeaa557
|
优化
|
2024-04-24 17:57:47 +08:00 |
|
BianLzhaoMin
|
f10ef57196
|
问题优化
|
2024-04-20 17:03:23 +08:00 |
zhouzy062
|
f8bf0ba857
|
问题修改:验收图片上传，接入大屏
|
2024-03-07 09:19:47 +08:00 |
|
zhouzy062
|
15c8119f94
|
租赁平台登录
|
2024-02-27 18:02:33 +08:00 |
|
zhouzy062
|
14407d7f7e
|
南网登录
|
2024-01-29 10:21:25 +08:00 |
|
zhouzy062
|
567732d51e
|
登陆前端代码
|
2024-01-26 19:11:15 +08:00 |
|
zhouzy062
|
49320db995
|
导出功能，短信登录，领料模块优化审批
|
2024-01-10 16:29:46 +08:00 |
 bonus
|
8920821ac5
|
项目第一次上传git
|
2023-11-28 20:33:38 +08:00 |