From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/resources/mapper/AirEquipmentNongGengMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dao/src/main/resources/mapper/AirEquipmentNongGengMapper.xml b/dao/src/main/resources/mapper/AirEquipmentNongGengMapper.xml
index 6a34be8..cac377c 100644
--- a/dao/src/main/resources/mapper/AirEquipmentNongGengMapper.xml
+++ b/dao/src/main/resources/mapper/AirEquipmentNongGengMapper.xml
@@ -5,13 +5,15 @@
<mapper namespace="com.sandu.ximon.dao.mapper.AirEquipmentNongGengMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirEquipmentNongGeng">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="mac" column="mac" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="mac" column="mac" jdbcType="VARCHAR"/>
+ <result property="type" column="type" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
- id,mac,create_time
+ id,mac,type,
+ create_time
</sql>
<select id="listAirEquipmentByIds" resultType="com.sandu.ximon.dao.bo.AirEquipmentNongGengBo">
SELECT
--
Gitblit v1.9.3