 hjx
|
b00308b729
|
Merge branch 'dev' into master
# Conflicts:
# mhd-common/mhd-common-core/src/main/java/minio/MinIoUploadService.java
# mhd_product/pom.xml
|
2025-12-17 23:27:46 +08:00 |
|
|
hjx
|
84a4ee1e76
|
问题修改
|
2025-12-17 23:16:58 +08:00 |
|
|
hjx
|
2c0882ae2d
|
问题修改
|
2025-12-17 19:03:43 +08:00 |
|
 王奎兴
|
09880952cf
|
获取网络货运司机id
|
2025-12-17 18:49:27 +08:00 |
|
|
hjx
|
e3f242f97b
|
问题修改
|
2025-12-17 18:41:12 +08:00 |
|
|
hjx
|
bcabed521d
|
问题修改
|
2025-12-17 18:02:55 +08:00 |
|
|
王奎兴
|
2199c8c739
|
获取网络货运司机id
|
2025-12-17 17:45:54 +08:00 |
|
|
hjx
|
8bc07e8090
|
解决产品启动问题
|
2025-12-17 10:09:44 +08:00 |
|
|
王奎兴
|
7ed03628fa
|
mqbug
|
2025-12-16 23:22:32 +08:00 |
|
 赵辉
|
2b3fa73db1
|
Merge branch 'refs/heads/nanguangmall' into dev
|
2025-12-16 17:08:56 +08:00 |
|
|
赵辉
|
c78b9c325c
|
userDriver类中添加车辆主体
|
2025-12-16 17:02:34 +08:00 |
|
|
王奎兴
|
6c2fb7c013
|
bug
|
2025-12-15 22:15:42 +08:00 |
|
|
赵辉
|
5cc3b9a62f
|
Merge branch 'refs/heads/nanguangmall' into dev
|
2025-12-15 17:16:34 +08:00 |
|
|
王奎兴
|
c27e2b624d
|
漏扫问题修改;
|
2025-12-15 17:15:42 +08:00 |
|
|
赵辉
|
21157b70ed
|
添加根据用户id查询企业信息
|
2025-12-15 17:15:16 +08:00 |
|
|
hjx
|
89e68566bf
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-12-14 18:21:47 +08:00 |
|
|
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 |
|