Commit Graph

693 Commits

Author SHA1 Message Date
csyue b35e883a53 1 2024-06-07 14:55:10 +08:00
hayu d6577e9a6e 修改 2024-06-07 14:42:33 +08:00
hayu 75895eaa56 新购流程修改 2024-06-07 09:58:35 +08:00
hayu c47cfa28d6 Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
2024-06-07 09:53:59 +08:00
csyue d74109015c 试运行问题修改 2024-06-06 17:59:23 +08:00
csyue 8c3665d599 试运行问题修改 2024-06-05 17:48:30 +08:00
csyue 2a0556f200 试运行问题修改 2024-06-05 15:44:39 +08:00
mashuai cd66690bd5 重置,修改加解密 2024-06-05 14:56:09 +08:00
csyue 860987874e 宁夏试运行问题修改 2024-06-05 13:15:29 +08:00
hayu facf7ffebc Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
2024-06-05 09:13:30 +08:00
csyue 8c120a3002 宁夏试运行问题修改 2024-06-04 18:10:42 +08:00
csyue 3be3330714 宁夏试运行问题修改 2024-06-04 13:04:54 +08:00
hayu dd9d4d5c20 Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
2024-06-04 09:12:04 +08:00
csyue 4201951630 宁夏试运行问题修改 2024-06-03 18:45:24 +08:00
csyue 403661be05 测试问题项修改 2024-05-31 23:38:35 +08:00
csyue d1c8638876 测试问题项修改 2024-05-31 15:19:44 +08:00
csyue 16dc57e902 测试问题项修改 2024-05-31 15:04:51 +08:00
csyue e547366f45 测试问题项修改 2024-05-31 14:48:04 +08:00
hayu f4d2a37cfe 新购流程修改 2024-05-31 13:09:02 +08:00
csyue b83a7dcf30 测试问题项修改 2024-05-30 17:55:01 +08:00
csyue 22b6be9f45 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-30 16:21:24 +08:00
csyue e84f1c4b31 测试问题项修改 2024-05-30 16:20:20 +08:00
mashuai 7096390f0c 配置更改 2024-05-30 15:20:28 +08:00
csyue f1584484ee 测试问题项修改 2024-05-30 13:57:07 +08:00
csyue 66fc5505eb 测试问题项修改 2024-05-30 09:52:38 +08:00
csyue 2ed82325b9 测试问题项修改 2024-05-29 19:34:25 +08:00
csyue 41813e09e9 测试问题项修改 2024-05-29 16:44:47 +08:00
mashuai 08c783d797 bug 2024-05-29 14:31:15 +08:00
csyue 564d5259f4 测试问题项修改 2024-05-29 13:13:45 +08:00
csyue e314a4c4b1 测试问题项修改 2024-05-29 13:06:56 +08:00
csyue 5740d5841d 测试问题项修改 2024-05-29 12:47:49 +08:00
csyue 88dc90fa49 测试问题项修改 2024-05-29 12:44:54 +08:00
csyue 12a3cc8887 测试问题项修改 2024-05-29 11:52:59 +08:00
csyue c2ea36160f 测试问题项修改 2024-05-29 11:24:18 +08:00
csyue f0db05ce34 测试问题项修改 2024-05-29 11:02:12 +08:00
csyue 6cd6940519 测试问题项修改 2024-05-29 10:57:05 +08:00
csyue 587ffc6eab 测试问题项修改 2024-05-29 09:12:30 +08:00
csyue 84d718b9bc Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
2024-05-28 18:36:05 +08:00
csyue 9eda3aa948 测试问题项修改 2024-05-28 18:30:04 +08:00
mashuai 6b89c6f089 盘点入库详情 2024-05-28 17:08:12 +08:00
csyue 43e0624cda 测试问题项修改 2024-05-28 15:50:36 +08:00
csyue 0b37588854 测试问题项修改 2024-05-28 09:43:10 +08:00
csyue 02e4f72d97 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-28 09:38:41 +08:00
mashuai a79ab95fe0 bug 2024-05-28 09:29:29 +08:00
csyue f766d1ae97 测试问题项修改 2024-05-27 20:45:12 +08:00
mashuai dd31e09009 手机号验证码次数限制 2024-05-27 18:42:32 +08:00
mashuai 3ebb67dd24 bug 2024-05-27 17:40:18 +08:00
mashuai 3e93e0ff4b bug 2024-05-27 16:30:00 +08:00
mashuai ba74371330 用户加解密 2024-05-25 16:35:50 +08:00
mashuai c45eb9c65b 盘点入库 2024-05-25 16:03:46 +08:00