From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/common/service/erp/ErpSqlServer.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/erp/ErpSqlServer.java b/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
index 37c7b15..0d73e07 100644
--- a/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
+++ b/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
@@ -67,6 +67,9 @@
/********************************* 鏍稿績灞� *********************************/
/*****************************************************************************/
+ /**
+ * map 杞� 瀵硅薄
+ */
private List<Map<String, Object>> executeQuery(String sql) {
Connection conn = null;
--
Gitblit v1.9.1