From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml b/src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml
index cd2cffb..da6f285 100644
--- a/src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml
+++ b/src/main/resources/mapper/DeviceAdjustValueTimingMapper.xml
@@ -1,7 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.moral.mapper.DeviceAdjustValueTimingMapper">
- <select id="selectAllByDeviceid" resultType="java.util.Map">
+ <resultMap id="BaseResultMap" type="com.moral.entity.DeviceAdjustValueTiming" >
+ <id column="id" property="id" jdbcType="INTEGER" />
+ <result column="device_id" property="deviceId" jdbcType="INTEGER" />
+ <result column="value" jdbcType="OTHER" property="value" javaType="java.util.Map" typeHandler="AdjustValueTypeHandle" />
+ <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+ <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+ </resultMap>
+ <delete id="delete">
+ delete from device_adjust_value_timing where id=#{id}
+ </delete>
+ <select id="selectAllByDeviceid" resultType="com.moral.entity.DeviceAdjustValueTiming" resultMap="BaseResultMap">
SELECT * FROM device_adjust_value_timing
WHERE device_id = #{device_id}
</select>
--
Gitblit v1.8.0