From f90496a3b635226e1be5321402b6afd1fdd2fa84 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 16 一月 2024 17:15:03 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index fa8b81d..209c07b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -19,13 +19,14 @@
<result column="intakeId" jdbcType="BIGINT" property="intakeId" />
<result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
</resultMap>
+
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, intakeId, rtuAddr, protocol, findDt, addWays, `operator`, operateDt, deleted
</sql>
<sql id="Part_Column_List">
<!--@mbg.generated-->
- id, rtuAddr
+ id, rtuAddr, intakeId
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
index f3830e0..28f8d9e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
@@ -21,7 +21,7 @@
where id = #{id,jdbcType=BIGINT}
</select>
- <select id="selectPrControllerTrampByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
+ <select id="getPrControllerTrampByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
--
Gitblit v1.8.0