From 37931d04e87cbae60cf833890c2c8432b389fa1a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 01 三月 2024 08:56:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
index 7deef2a..19ce357 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
@@ -64,7 +64,9 @@
// }
public Map<String, List<Object>> getBasicDataByType(String type){
+ //杩斿洖鍩虹鏁版嵁閲岀殑鎵�鏈夌被鍨�
List<String> orderBasicDataType = basicDateMapper.getOrderBasicDataType(type);
+ //杩斿洖姝ょ被鍨嬪熀纭�鏁版嵁鎵�鏈夋暟鎹�
List<BasicData> orderBasicData = basicDateMapper.getOrderBasicData(type);
Map<String, List<Object>> BasicDataMap = new HashMap<>();
//鍒涘缓List瀵硅薄
--
Gitblit v1.8.0