From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 base-server/src/main/java/com/yuanchu/mom/service/TechnicalModelService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/base-server/src/main/java/com/yuanchu/mom/service/TechnicalModelService.java b/base-server/src/main/java/com/yuanchu/mom/service/TechnicalModelService.java
index eba56c2..21ac728 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/TechnicalModelService.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/TechnicalModelService.java
@@ -22,7 +22,7 @@
      * @param message
      * @return
      */
-    List<Map<String, Object>> selectAllTechTem(Integer type, String message);
+    List<Map<String, Object>> selectAllTechTem(String type, String message);
 
     /**
      * 鏌ヨ鎶�鏈寚鏍囩淮鎶ゅ垪琛�-->鍙宠竟灞曠ず璇ュ伐鑹轰笅鐨勬楠岄」鐩�
@@ -37,7 +37,7 @@
      *
      * @return
      */
-    List<Map<String, Object>> chooseTechFath(Integer type);
+    List<Map<String, Object>> chooseTechFath(String type);
 
     /**
      * 鏂板鎶�鏈寚鏍囩淮鎶�-->閫夋嫨椤圭洰(鐖剁被)

--
Gitblit v1.9.3