From 73d40d9e83b6ce8c1b562f22e6a28b46d124a2cc Mon Sep 17 00:00:00 2001
From: mengff <1198151809@qq.com>
Date: Tue, 19 Mar 2024 12:55:28 +0800
Subject: [PATCH] =?UTF-8?q?--=E6=9B=B4=E6=94=B9=E5=8E=82=E5=95=86=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/StatusMapper.xml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zc-business/src/main/resources/mapper/business/StatusMapper.xml b/zc-business/src/main/resources/mapper/business/StatusMapper.xml
index 7b6d216b..4943b263 100644
--- a/zc-business/src/main/resources/mapper/business/StatusMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/StatusMapper.xml
@@ -13,7 +13,7 @@
         <result column="lost_rate" jdbcType="VARCHAR" property="lostRate"/>
 
         <result column="direction" jdbcType="VARCHAR" property="direction"/>
-        <result column="product_name" jdbcType="VARCHAR" property="production"/>
+        <result column="manufacturer" jdbcType="VARCHAR" property="production"/>
         <result column="model" jdbcType="VARCHAR" property="model"/>
         <result column="facilities_type" jdbcType="VARCHAR" property="network"/>
         <result column="remark" jdbcType="VARCHAR" property="content"/>
@@ -85,7 +85,7 @@
     </sql>
 
     <select id="listStatus" parameterType="com.zc.business.domain.Status" resultMap="BaseResultMap">
-        select s.id, s.device_no, s.device_name, s.device_status,s.time, d.device_ip,s.success_rate,s.lost_rate,d.direction,e.product_name,e.model,d.facilities_type,d.remark,COALESCE(d.child_type, d.device_type) AS type
+        select s.id, s.device_no, s.device_name, s.device_status,s.time, d.device_ip,s.success_rate,s.lost_rate,d.direction,e.manufacturer,e.model,d.facilities_type,d.remark,COALESCE(d.child_type, d.device_type) AS type
         from dc_device d
         LEFT JOIN status s on (s.device_id=d.id)
         LEFT JOIN  dc_product e on e.id=d.product_id