From a4d36003a8b4a7e6691009c015d2396d8f13b32e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 20:15:20 +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 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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 c9e5208..a40bbe2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
@@ -136,13 +136,13 @@
                 id = #{id,jdbcType=VARCHAR}
             </if>
             <if test="rtuAddr != null and rtuAddr != ''">
-                AND   rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
+                AND rtuAddr = #{rtuAddr,jdbcType=VARCHAR}
             </if>
             <if test="protocol != null and protocol != ''">
-                AND  protocol = #{protocol,jdbcType=VARCHAR}
+                AND protocol = #{protocol,jdbcType=VARCHAR}
             </if>
         </where>
-        order by rtuAddr desc
+        order by id desc
         <trim prefix="limit " >
             <if test="start != null and count != null">
                 #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}

--
Gitblit v1.8.0