From dcbaeb85065356da81ba6f3e44a3bff69b3c22e8 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Mon, 22 Sep 2025 17:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A0=86=E5=9E=9B=E6=9C=BA?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/device/MsgDdjMapper.xml  | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/device/MsgDdjMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/MsgDdjMapper.xml
index 5db73ba..87deede 100644
--- a/ruoyi-admin/src/main/resources/mapper/device/MsgDdjMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/device/MsgDdjMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.device.ddj.mapper.MsgDdjMapper">
-    
+
     <resultMap type="MsgDdj" id="MsgDdjResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
@@ -12,12 +12,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sbzt"    column="sbzt"    />
         <result property="czfs"    column="czfs"    />
         <result property="yxxf"    column="yxxf"    />
-        <result property="yp"    column="yp"    />
-        <result property="yl"    column="yl"    />
-        <result property="yc"    column="yc"    />
-        <result property="mbp"    column="mbp"    />
-        <result property="mbl"    column="mbl"    />
-        <result property="mbc"    column="mbc"    />
+        <result property="yph"    column="yph"    />
+        <result property="ylh"    column="ylh"    />
+        <result property="ych"    column="ych"    />
+        <result property="mbph"    column="mbph"    />
+        <result property="mblh"    column="mblh"    />
+        <result property="mbch"    column="mbch"    />
         <result property="xtxh"    column="xtxh"    />
         <result property="dqxd"    column="dqxd"    />
         <result property="hczt"    column="hczt"    />
@@ -27,24 +27,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMsgDdjVo">
-        select id, name, rwh, jdbz, sbzt, czfs, yxxf, yp, yl, yc, mbp, mbl, mbc, xtxh, dqxd, hczt, spare1, spare2, spare3 from msg_ddj
+        select id, name, rwh, jdbz, sbzt, czfs, yxxf, yph, ylh, ych, mbph, mblh, mbch, xtxh, dqxd, hczt, spare1, spare2, spare3 from msg_ddj
     </sql>
 
     <select id="selectMsgDdjList" parameterType="MsgDdj" resultMap="MsgDdjResult">
         <include refid="selectMsgDdjVo"/>
-        <where>  
+        <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="rwh != null "> and rwh = #{rwh}</if>
             <if test="jdbz != null "> and jdbz = #{jdbz}</if>
             <if test="sbzt != null "> and sbzt = #{sbzt}</if>
             <if test="czfs != null "> and czfs = #{czfs}</if>
             <if test="yxxf != null "> and yxxf = #{yxxf}</if>
-            <if test="yp != null "> and yp = #{yp}</if>
-            <if test="yl != null "> and yl = #{yl}</if>
-            <if test="yc != null "> and yc = #{yc}</if>
-            <if test="mbp != null "> and mbp = #{mbp}</if>
-            <if test="mbl != null "> and mbl = #{mbl}</if>
-            <if test="mbc != null "> and mbc = #{mbc}</if>
+            <if test="yph != null "> and yph = #{yph}</if>
+            <if test="ylh != null "> and ylh = #{ylh}</if>
+            <if test="ych != null "> and ych = #{ych}</if>
+            <if test="mbph != null "> and mbph = #{mbph}</if>
+            <if test="mblh != null "> and mblh = #{mblh}</if>
+            <if test="mbch != null "> and mbch = #{mbch}</if>
             <if test="xtxh != null "> and xtxh = #{xtxh}</if>
             <if test="dqxd != null "> and dqxd = #{dqxd}</if>
             <if test="hczt != null "> and hczt = #{hczt}</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare3 != null "> and spare3 = #{spare3}</if>
         </where>
     </select>
-    
+
     <select id="selectMsgDdjById" parameterType="Long" resultMap="MsgDdjResult">
         <include refid="selectMsgDdjVo"/>
         where id = #{id}
@@ -69,12 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sbzt != null">sbzt,</if>
             <if test="czfs != null">czfs,</if>
             <if test="yxxf != null">yxxf,</if>
-            <if test="yp != null">yp,</if>
-            <if test="yl != null">yl,</if>
-            <if test="yc != null">yc,</if>
-            <if test="mbp != null">mbp,</if>
-            <if test="mbl != null">mbl,</if>
-            <if test="mbc != null">mbc,</if>
+            <if test="yph != null">yph,</if>
+            <if test="ylh != null">ylh,</if>
+            <if test="ych != null">ych,</if>
+            <if test="mbph != null">mbph,</if>
+            <if test="mblh != null">mblh,</if>
+            <if test="mbch != null">mbch,</if>
             <if test="xtxh != null">xtxh,</if>
             <if test="dqxd != null">dqxd,</if>
             <if test="hczt != null">hczt,</if>
@@ -90,12 +90,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sbzt != null">#{sbzt},</if>
             <if test="czfs != null">#{czfs},</if>
             <if test="yxxf != null">#{yxxf},</if>
-            <if test="yp != null">#{yp},</if>
-            <if test="yl != null">#{yl},</if>
-            <if test="yc != null">#{yc},</if>
-            <if test="mbp != null">#{mbp},</if>
-            <if test="mbl != null">#{mbl},</if>
-            <if test="mbc != null">#{mbc},</if>
+            <if test="yph != null">#{yph},</if>
+            <if test="ylh != null">#{ylh},</if>
+            <if test="ych != null">#{ych},</if>
+            <if test="mbph != null">#{mbph},</if>
+            <if test="mblh != null">#{mblh},</if>
+            <if test="mbch != null">#{mbch},</if>
             <if test="xtxh != null">#{xtxh},</if>
             <if test="dqxd != null">#{dqxd},</if>
             <if test="hczt != null">#{hczt},</if>
@@ -114,12 +114,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sbzt != null">sbzt = #{sbzt},</if>
             <if test="czfs != null">czfs = #{czfs},</if>
             <if test="yxxf != null">yxxf = #{yxxf},</if>
-            <if test="yp != null">yp = #{yp},</if>
-            <if test="yl != null">yl = #{yl},</if>
-            <if test="yc != null">yc = #{yc},</if>
-            <if test="mbp != null">mbp = #{mbp},</if>
-            <if test="mbl != null">mbl = #{mbl},</if>
-            <if test="mbc != null">mbc = #{mbc},</if>
+            <if test="yph != null">yp = #{yph},</if>
+            <if test="ylh != null">yl = #{ylh},</if>
+            <if test="ych != null">yc = #{ych},</if>
+            <if test="mbph != null">mbp = #{mbph},</if>
+            <if test="mblh != null">mbl = #{mblh},</if>
+            <if test="mbch != null">mbc = #{mbch},</if>
             <if test="xtxh != null">xtxh = #{xtxh},</if>
             <if test="dqxd != null">dqxd = #{dqxd},</if>
             <if test="hczt != null">hczt = #{hczt},</if>
@@ -135,9 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteMsgDdjByIds" parameterType="String">
-        delete from msg_ddj where id in 
+        delete from msg_ddj where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>