Commit Graph
209 Commits
Author SHA1 Message Date
hjx b3355cd1d0 测试环境配置 2026-01-15 02:47:42 +08:00
hjx 9da953619f nc通宇修改 2026-01-15 02:40:58 +08:00
hjx 781d530c21 NC推送修改 2026-01-15 01:54:11 +08:00
hjx 419cb53845 查询科目信息修改 2026-01-15 01:37:04 +08:00
hjx f73f74939f 通宇nc修改 2026-01-15 00:45:29 +08:00
hjx 8ea215c58c 通宇组装摘要修改 2026-01-14 23:45:54 +08:00
王奎兴 4bde2aee3d 配置文件 2026-01-14 23:30:43 +08:00
王奎兴 9996f59fe4 角色管理查询不过滤RoleGrade 2026-01-14 23:25:17 +08:00
王奎兴 e5f8ddd8b6 配置文件修改; 2026-01-14 22:31:02 +08:00
王奎兴 0533d1a941 Merge branch 'refs/heads/test' into dev 2026-01-14 22:28:59 +08:00
王奎兴 536079a024 发票打印修改; 2026-01-14 22:28:27 +08:00
hjx a648c4a50d 应收账单科目修改 2026-01-14 22:01:21 +08:00
hjx a484296ab8 应收账单查询科目信息 2026-01-14 19:03:28 +08:00
hjx 1708b4384c 应收账单保存科目信息和nc推送修改 2026-01-14 17:24:20 +08:00
王奎兴 8d89f5ec27 应收账单结算页面结算币种 2026-01-14 16:46:00 +08:00
王奎兴 84ab2c8bf9 Merge remote-tracking branch 'refs/remotes/origin/dev' into test
# Conflicts:
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
2026-01-14 16:40:52 +08:00
hjx 14cfad6b50 修改科目创建订单默认显示设置 2026-01-14 15:20:06 +08:00
hjx abf2847475 科目信息修改 2026-01-14 14:56:25 +08:00
王奎兴 65552144eb Merge branch 'dev_wkx_yutong_20260106' into dev 2026-01-14 14:25:08 +08:00
王奎兴 2558e1ab2a 应收账单结算页面结算币种 2026-01-14 10:59:42 +08:00
高正杨 64d2a5e001 发单报found2; 2026-01-14 09:46:37 +08:00
高正杨 801a7c3b9c equals判空; 2026-01-14 08:33:56 +08:00
1745237360-cloud 932c432eff Merge remote-tracking branch 'origin/dev' into dev 2026-01-13 20:43:18 +08:00
1745237360-cloud 6606c65d73 数据权限的bug修改260113 2026-01-13 20:43:04 +08:00
王奎兴 89b5d544c6 Merge branch 'dev_wkx_yutong_20260106' into dev 2026-01-13 18:54:45 +08:00
王奎兴 8f0d4ed687 委托方查询结算币种 2026-01-13 18:54:18 +08:00
王奎兴 e77897c597 委托方查询结算币种 2026-01-13 18:48:00 +08:00
hjx 931d63a5da nc对接修改添加通宇 2026-01-13 17:26:59 +08:00
1745237360-cloud 8924757467 Merge remote-tracking branch 'origin/dev' into dev 2026-01-13 15:17:12 +08:00
1745237360-cloud 7476599ffd 数据权限的bug修改260113 2026-01-13 15:16:55 +08:00
hjx bb43850227 Merge remote-tracking branch 'origin/dev' into dev 2026-01-13 14:16:55 +08:00
hjx 32d638730d nc对接修改添加通宇 2026-01-13 14:16:24 +08:00
1745237360-cloud c4bd6d18d4 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	mhd-user-center/src/main/resources/mapper/UserMapper.xml
2026-01-13 11:34:46 +08:00
1745237360-cloud 035593b419 数据权限的bug修改260113 2026-01-13 11:32:57 +08:00
王奎兴 d7df2da828 委托方查询结算币种 2026-01-12 15:23:19 +08:00
1745237360-cloud 935c154136 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
2026-01-12 14:32:37 +08:00
1745237360-cloud c8493dd658 数据权限的bug修改 2026-01-12 14:30:00 +08:00
赵辉 d2e8d6ab30 Merge branch 'refs/heads/dev_zh_ty_20260108' into dev 2026-01-12 13:54:15 +08:00
赵辉 540a687f7e 修改副驾绑定 2026-01-12 13:53:01 +08:00
王奎兴 c337a7ed49 委托方查询接口添加结算币种; 2026-01-10 20:39:53 +08:00
1745237360-cloud f7e6f70321 Merge branch 'refs/heads/dev_qinhongzhan' 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/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
#	mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java
2026-01-10 16:45:38 +08:00
1745237360-cloud 4b427e1b2e 数据权限的修改 2026-01-10 16:39:33 +08:00
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
王奎兴 3ec71c4a88 Merge remote-tracking branch 'origin/dev_wkx_yutong_20260106' into dev 2026-01-06 18:59:01 +08:00
王奎兴 0db01980b8 物料不选货主也可更新; 2026-01-06 17:48:12 +08:00
hjx 865610fda3 推送nc输出日志 2026-01-06 17:43:18 +08:00
王奎兴 8b98c54d11 Revert "回复大小写敏感;"
This reverts commit 6cb96410a2.
2026-01-05 15:50:23 +08:00
王奎兴 fd579a6f42 nacos配置; 2026-01-05 13:17:16 +08:00
王奎兴 f14547eb53 nacos配置; 2026-01-05 08:42:07 +08:00