Commit Graph
46 Commits
Author SHA1 Message Date
hjx 2e284f450d nc切换正式地址 2026-01-07 15:55:21 +08:00
hjx af7dda73de Merge branch 'dev' into master
# 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
2026-01-07 15:04:36 +08:00
hjx 865610fda3 推送nc输出日志 2026-01-06 17:43:18 +08:00
王奎兴 f14547eb53 nacos配置; 2026-01-05 08:42:07 +08:00
王奎兴 29b24e8450 nacos修改; 2025-12-30 13:50:37 +08:00
王奎兴 1d9629127a 结算币种修改; 2025-12-23 13:38:56 +08:00
hjx b11a0be679 nc问题修改 2025-12-18 03:35:08 +08:00
hjx 88c3548129 nc问题修改 2025-12-18 03:34:06 +08:00
hjx 9bc90fe601 nc问题修改 2025-12-18 03:08:18 +08:00
hjx d805e2d642 nc问题修改 2025-12-18 01:35:35 +08:00
hjx d2da556697 nc问题修改 2025-12-18 01:30:31 +08:00
hjx 3ee81a06eb nc问题修改 2025-12-18 01:29:02 +08:00
hjx b8799a1ec7 nc问题修改 2025-12-18 00:29:03 +08:00
hjx 84a4ee1e76 问题修改 2025-12-17 23:16:58 +08:00
王奎兴 c27e2b624d 漏扫问题修改; 2025-12-15 17:15:42 +08:00
王奎兴 4a7d28350e Revert "恢复大小写"
This reverts commit 52cdfbe6d9.
2025-12-14 15:12:59 +08:00
王奎兴 52cdfbe6d9 恢复大小写 2025-12-14 14:29:16 +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
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
hjx d58b948c3a 配置文件修改 2025-12-10 15:05:19 +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
王奎兴 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 9153b6a498 arm适配 2025-12-09 16:14:22 +08:00
hjx f63a48783e arm适配 2025-12-09 11:54:45 +08:00
LAPTOP-DREK3SC6\86186 c58b3cc689 arm适配 2025-12-08 23:46:19 +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
赵辉 0b361ba2b7 12.6修改 2025-12-06 20:31:05 +08:00
hjx 7ff3054dc9 南歧nc65对接 2025-12-06 08:58:04 +08:00
赵辉 a950417939 12.5修改 2025-12-05 21:42:06 +08:00
hjx 7efbe3d404 南歧nc65对接 2025-12-05 18:21:36 +08:00
王奎兴 32f12bb138 达梦适配修改 2025-12-05 10:47:46 +08:00
hjx 73a2d7f1c9 南歧nc65对接 2025-12-02 20:48:25 +08:00
陈现府 5005f4291f 添加线上环境配置 2025-11-22 17:54:14 +08:00
陈现府 8355431361 first commit 2025-11-20 10:45:16 +08:00