From eaa1222dd2b809219f96cf64537a5b7e2ebd4944 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 28 六月 2024 19:54:51 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
index bb6d416..fbf92a0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -343,7 +343,7 @@
         blo.name AS blockName,
         CAST(cli.divideId AS char) AS divideId,
         divi.name AS divideName,
-        CAST(cli.typeId AS char) AS waterTypeId,
+        CAST(cli.typeId AS char) AS typeId,
         wat.typeName AS waterTypeName,
         CAST(cli.id AS char) AS clientId,
         cli.name,
@@ -431,7 +431,7 @@
 
   <!--鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃-->
   <select id="getWaterTypes" resultType="java.util.Map">
-    SELECT id, typeName from se_water_type
+    SELECT CAST(se_water_type.id AS char) AS id, typeName from se_water_type
   </select>
 
   <!--鑾峰彇鍐滄埛鍩烘湰淇℃伅锛屽皬绋嬪簭棣栭〉浣跨敤-->

--
Gitblit v1.8.0