From 3364d6efd58eca1d6acf129948265b1e663dae7a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 13:38:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
index dc3787c..0e50e52 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
@@ -18,7 +18,7 @@
</resultMap>
<sql id="selectYwThresholdVo">
- select id, monitor_type, count_type , key, name, value, value_auto, create_time, update_time, description, deleted from t_yw_threshold
+ select id, monitor_type, count_type, `key` , name, value, value_auto, create_time, update_time, description, deleted from t_yw_threshold
</sql>
<select id="selectYwThresholdList" parameterType="YwThreshold" resultMap="YwThresholdResult">
@@ -44,7 +44,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="monitorType != null and monitorType != ''">monitor_type,</if>
<if test="countType != null">count_type,</if>
- <if test="key != null">key,</if>
+ <if test="key != null">`key`,</if>
<if test="name != null">name,</if>
<if test="value != null">value,</if>
<if test="valueAuto != null">value_auto,</if>
@@ -72,7 +72,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="monitorType != null and monitorType != ''">monitor_type = #{monitorType},</if>
<if test="countType != null">count_type = #{countType},</if>
- <if test="key != null">key = #{key},</if>
+ <if test="key != null">`key` = #{key},</if>
<if test="name != null">name = #{name},</if>
<if test="value != null">value = #{value},</if>
<if test="valueAuto != null">value_auto = #{valueAuto},</if>
--
Gitblit v1.8.0