Merge branch 'master' into test

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceChargingMapper.xml

@@ -4,15 +4,15 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.xy.entity.DeviceCharging">
-        <id column="device_id" property="deviceId" />
-        <result column="device_type" property="deviceType" />
-        <result column="charging_money" property="chargingMoney" />
-        <result column="charging_sum_money" property="chargingSumMoney" />
-        <result column="charging_type" property="chargingType" />
-        <result column="status" property="status" />
-        <result column="timeout" property="timeout" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
+        <id column="device_id" property="deviceId"/>
+        <result column="device_type" property="deviceType"/>
+        <result column="charging_money" property="chargingMoney"/>
+        <result column="charging_sum_money" property="chargingSumMoney"/>
+        <result column="charging_type" property="chargingType"/>
+        <result column="status" property="status"/>
+        <result column="timeout" property="timeout"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
     </resultMap>
 
     <!-- 管理费过期 -->
@@ -22,11 +22,11 @@
         device_charging dc join device_info di on(dc.device_id = di.device_id)
         where
         1 = 1
-        <if test="params.begin != null">
-            and dc.timeout >= #{params.begin}
+        <if test="begin != null">
+            and dc.timeout >= #{begin}
         </if>
-        <if test="params.end != null">
-            and dc.timeout &lt;= #{params.end}
+        <if test="end != null">
+            and dc.timeout &lt;= #{end}
         </if>
         GROUP BY di.merc_id
     </select>