From c0a45b7b68f60ccd25d759808351a84ea070ce09 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 13 九月 2024 15:44:15 +0800
Subject: [PATCH] Merge branch 'master-base' into master-test
---
phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java b/phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java
index a8c6427..e3cf1ca 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/controller/micro/MicroRecordV2Controller.java
@@ -1056,7 +1056,7 @@
Map<String, List<MjDataVo>> mjDataVoMap = null;
List<MjDataVo> mjDataVoList = null;
//鑾峰彇妯℃澘鍒嗙被鏁版嵁(閫傚簲鐥�,鍒嗙被)
- Map<String, List<String>> relationMap = MeiJiDataTool.getRelationMap();
+ Map<String, List<String>> relationMap = MeiJiDataTool.getRelationMap(commonService);
//灏佽缁撴瀯
for (List<String> value : relationMap.values()) {
//list鏄湁椤哄簭鐨�,0鏄竴绾у垎绫�,1鏄簩绾у垎绫�
--
Gitblit v1.8.0