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/LightEnergyDataMapper.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dao/src/main/resources/mapper/LightEnergyDataMapper.xml b/dao/src/main/resources/mapper/LightEnergyDataMapper.xml
index df4456e..e134f2e 100644
--- a/dao/src/main/resources/mapper/LightEnergyDataMapper.xml
+++ b/dao/src/main/resources/mapper/LightEnergyDataMapper.xml
@@ -5,21 +5,21 @@
<mapper namespace="com.sandu.ximon.dao.mapper.LightEnergyDataMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightEnergyData">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="taskId" column="task_id" jdbcType="BIGINT"/>
- <result property="ytdTime" column="ytd_time" jdbcType="VARCHAR"/>
- <result property="energy" column="energy" jdbcType="DOUBLE"/>
- <result property="energySaving" column="energy_saving" jdbcType="DOUBLE"/>
- <result property="poleId" column="pole_id" jdbcType="BIGINT"/>
- <result property="userId" column="user_id" jdbcType="BIGINT"/>
- <result property="clientId" column="client_id" jdbcType="BIGINT"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="taskId" column="task_id" jdbcType="BIGINT"/>
+ <result property="ytdTime" column="ytd_time" jdbcType="VARCHAR"/>
+ <result property="energy" column="energy" jdbcType="DECIMAL"/>
+ <result property="energySaving" column="energy_saving" jdbcType="DECIMAL"/>
+ <result property="poleId" column="pole_id" jdbcType="BIGINT"/>
+ <result property="lightAdderss" column="light_adderss" jdbcType="VARCHAR"/>
+ <result property="userId" column="user_id" jdbcType="BIGINT"/>
+ <result property="clientId" column="client_id" jdbcType="BIGINT"/>
</resultMap>
<sql id="Base_Column_List">
- id
- ,task_id,ytd_time,
- energy,energy_saving,user_id,
- client_id
+ id,task_id,ytd_time,
+ energy,energy_saving,pole_id,
+ light_adderss,user_id,client_id
</sql>
<select id="getEnergyList" resultType="com.sandu.ximon.dao.domain.LightEnergyData">
SELECT
--
Gitblit v1.9.3