Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/model/tongji/MeterMonthDataVo.java

@@ -19,6 +19,8 @@ public class MeterMonthDataVo {
      */
     public Double meterPower;
 
+    public Double meterPowerRecord;
+
     /**
      * 水/电表号
      */

src/main/resources/mapper/template/WechatScanLoginMapper.xml

@@ -43,6 +43,7 @@
         <result property="buildAddress" column="build_address"/>
         <result property="address" column="address"/>
         <result property="meterPower" column="meter_power"/>
+        <result property="meterPowerRecord" column="meter_power_record"/>
         <result property="meterNo" column="meter_no"/>
         <result property="createTime" column="create_time"/>
     </resultMap>
@@ -268,7 +269,7 @@
 
     <!--实时抄表-->
     <select id="getMeterDayPage" resultMap="meterMonthDataVo">
-        select smd.id,sm.build_address,sm.address,smd.meter_power,sm.meter_no,smd.create_time from smart_meter_detail
+        select smd.id,sm.build_address,sm.address,smd.meter_power,smd.meter_power_record,sm.meter_no,smd.create_time from smart_meter_detail
         smd
         left join smart_meter sm on sm.deleted = 0 and sm.id = smd.meter_id
         where smd.deleted = 0