From 4e07b25ea19699bd34c6ab146432c4348fd68806 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 20 May 2021 13:10:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/resources/mapper/SensorMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/SensorMapper.xml b/screen-manage/src/main/resources/mapper/SensorMapper.xml
index 71810cc..2e147ef 100644
--- a/screen-manage/src/main/resources/mapper/SensorMapper.xml
+++ b/screen-manage/src/main/resources/mapper/SensorMapper.xml
@@ -10,14 +10,14 @@
<result column="code" property="code" />
<result column="upper" property="upper" />
<result column="lower" property="lower" />
- <result column="default_util" property="defaultUtil" />
+ <result column="default_unit_key" property="defaultUnitKey" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="is_delete" property="isDelete" />
</resultMap>
<sql id="Base_Column_List">
- s.id,s.name,s.code,s.desc,s.upper,s.lower,s.default_util,s.create_time,s.update_time,s.is_delete
+ s.id,s.name,s.code,s.desc,s.upper,s.lower,s.default_unit_key,s.create_time,s.update_time,s.is_delete
</sql>
<insert id="insertOne" parameterType="com.moral.api.entity.Sensor">
@@ -38,8 +38,8 @@
<if test="lower != null">
lower,
</if>
- <if test="defaultUtil != null">
- default_util,
+ <if test="defaultUnitKey != null">
+ default_unit_key,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -58,8 +58,8 @@
<if test="lower != null">
#{lower},
</if>
- <if test="defaultUtil != null">
- #{defaultUtil},
+ <if test="defaultUnitKey != null">
+ #{defaultUnitKey},
</if>
</trim>
</insert>
@@ -90,8 +90,8 @@
<if test="lower != null">
lower = #{lower},
</if>
- <if test="default_util != null">
- default_util = #{default_util},
+ <if test="default_unit_key != null">
+ default_unit_key = #{default_unit_key},
</if>
<if test="isDelete != null">
is_delete = #{isDelete},
--
Gitblit v1.8.0