From cd45cee236780a8e02244d8d8a916088ca002d3d Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 06 五月 2024 16:06:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
index df62638..9e87a44 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeControllerMapper.xml
@@ -150,7 +150,8 @@
<select id="getBindsByIntakeId" resultType="java.util.Map">
SELECT
user.name AS userName,
- con.code AS controllerCode,
+ <!--con.code AS controllerCode,-->
+ con.rtuAddr,
(CASE
WHEN ic.operateType = 1 THEN "缁戝畾"
WHEN ic.operateType = 2 THEN "瑙ｇ粦"
--
Gitblit v1.8.0