hjx
|
088460459b
|
漏洞修改
|
2025-12-14 18:21:34 +08:00 |
|
王奎兴
|
4a7d28350e
|
Revert "恢复大小写"
This reverts commit 52cdfbe6d9.
|
2025-12-14 15:12:59 +08:00 |
|
hjx
|
04e26568ae
|
Merge branch 'loudongsaomiao_20251213' into dev
|
2025-12-14 15:00:38 +08:00 |
|
王奎兴
|
52cdfbe6d9
|
恢复大小写
|
2025-12-14 14:29:16 +08:00 |
|
赵辉
|
2b385f45cd
|
Merge branch 'refs/heads/nanguangmall' into dev
|
2025-12-13 23:07:56 +08:00 |
|
赵辉
|
51b5ae5d13
|
12.13修改
|
2025-12-13 23:06:31 +08:00 |
|
王奎兴
|
927b5a4411
|
Merge remote-tracking branch 'origin/dev_wkx_20251209' into dev
|
2025-12-13 22:59:55 +08:00 |
|
王奎兴
|
0beab25b52
|
bug修复;
|
2025-12-13 22:59:26 +08:00 |
|
王奎兴
|
c830009948
|
Merge remote-tracking branch 'origin/dev_wkx_20251209' into dev
|
2025-12-13 22:06:34 +08:00 |
|
王奎兴
|
4248a334ab
|
bug修复;
|
2025-12-13 22:06:02 +08:00 |
|
王奎兴
|
97330de8ba
|
bug修复;
|
2025-12-13 20:48:24 +08:00 |
|
hjx
|
133824fb53
|
漏洞修改
|
2025-12-13 19:52:26 +08:00 |
|
hjx
|
f8399951b3
|
Merge branch 'dev_nc2k_20251213' into dev
# Conflicts:
# mhd-auth/src/main/resources/bootstrap.yml
# mhd-gateway/src/main/resources/bootstrap.yml
# mhd-modules/mhd-system/src/main/resources/bootstrap.yml
# mhd-user-center/src/main/resources/bootstrap.yml
# mhd_finance/src/main/resources/bootstrap.yml
# mhd_product/src/main/resources/bootstrap.yml
# mhd_thrid_party/src/main/resources/bootstrap.yml
# mhd_transport/src/main/resources/bootstrap.yml
|
2025-12-13 17:32:20 +08:00 |
|
hjx
|
3447d2f7bc
|
nc上传添加字段传值
|
2025-12-13 17:26:17 +08:00 |
|
hjx
|
8affee1409
|
漏洞扫描修改
|
2025-12-13 15:06:42 +08:00 |
|
hjx
|
a18fd9d59b
|
漏洞扫描修改
|
2025-12-13 15:04:36 +08:00 |
|
王奎兴
|
74e735353f
|
本地开发分支配置文件修改
|
2025-12-12 10:16:50 +08:00 |
|
王奎兴
|
afc49be45f
|
订单发货校验去除;
|
2025-12-12 10:16:18 +08:00 |
|
hjx
|
61e52aa744
|
配置文件修改
|
2025-12-11 14:42:10 +08:00 |
|
hjx
|
f485b040e1
|
配置文件修改
|
2025-12-11 14:28:35 +08:00 |
|
hjx
|
3d4df0a154
|
Merge branch 'dev_minio_20251210' into master
|
2025-12-11 12:38:42 +08:00 |
|
hjx
|
e6c9c206b2
|
minio对接
|
2025-12-11 12:36:17 +08:00 |
|
hjx
|
71fbf2ad1b
|
minio对接
|
2025-12-10 22:31:22 +08:00 |
|
hjx
|
d58b948c3a
|
配置文件修改
|
2025-12-10 15:05:19 +08:00 |
|
hjx
|
ddd8f7c4d7
|
配置文件修改
|
2025-12-10 15:01:31 +08:00 |
|
hjx
|
c6709936f9
|
配置文件修改
|
2025-12-10 14:24:02 +08:00 |
|
hjx
|
4be7e27ee0
|
minio对接
|
2025-12-10 14:21:53 +08:00 |
|
hjx
|
3f2ac515d5
|
nacos配置文件修改
|
2025-12-10 10:48:38 +08:00 |
|
赵辉
|
df299a21ae
|
Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall
|
2025-12-10 09:28:06 +08:00 |
|
赵辉
|
7b10ff2b25
|
12.9修改
|
2025-12-10 09:21:33 +08:00 |
|
hjx
|
1b8a0eb8a4
|
Merge branch 'dev_arm_251208' into dev
|
2025-12-10 09:14:07 +08:00 |
|
hjx
|
083e5fc145
|
arm适配
|
2025-12-10 01:35:21 +08:00 |
|
hjx
|
f2a65c9039
|
arm适配
|
2025-12-09 19:41:55 +08:00 |
|
王奎兴
|
4ca5121856
|
Merge branch 'dm_20251204' into dev
|
2025-12-09 19:14:42 +08:00 |
|
王奎兴
|
ab1472ff50
|
达梦适配大小写敏感
|
2025-12-09 18:43:00 +08:00 |
|
hjx
|
2a393ceb2c
|
arm适配
|
2025-12-09 18:29:09 +08:00 |
|
hjx
|
5b02024f4c
|
arm适配
|
2025-12-09 17:36:49 +08:00 |
|
hjx
|
9153b6a498
|
arm适配
|
2025-12-09 16:14:22 +08:00 |
|
hjx
|
737f61ca48
|
arm适配
|
2025-12-09 12:06:01 +08:00 |
|
hjx
|
f63a48783e
|
arm适配
|
2025-12-09 11:54:45 +08:00 |
|
hjx
|
409af3c4ce
|
arm适配
|
2025-12-09 11:17:54 +08:00 |
|
hjx
|
099caba531
|
arm适配
|
2025-12-09 09:25:01 +08:00 |
|
LAPTOP-DREK3SC6\86186
|
c58b3cc689
|
arm适配
|
2025-12-08 23:46:19 +08:00 |
|
王奎兴
|
8a4423db5f
|
达梦适配遗漏
|
2025-12-08 15:02:50 +08:00 |
|
王奎兴
|
990f145846
|
达梦适配遗漏
|
2025-12-06 22:22:54 +08:00 |
|
王奎兴
|
0f8f3de71b
|
解决代码冲突
|
2025-12-06 22:17:12 +08:00 |
|
王奎兴
|
2a1e542704
|
Merge branch 'dm_20251204' into dev
# Conflicts:
# mhd-user-center/src/main/resources/mapper/UserMapper.xml
# mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
|
2025-12-06 22:15:26 +08:00 |
|
hjx
|
8527d24d48
|
南歧nc65对接修改
|
2025-12-06 21:57:17 +08:00 |
|
王奎兴
|
5b2212d5db
|
达梦适配修改
|
2025-12-06 20:34:00 +08:00 |
|
赵辉
|
0b361ba2b7
|
12.6修改
|
2025-12-06 20:31:05 +08:00 |
|