Merge branch 'master' into test

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

@@ -16,7 +16,7 @@
     </resultMap>
 
     <!-- 管理费过期 -->
-    <select id="deviceChargingTimeout1" resultType="long">
+    <select id="deviceChargingTimeout1" resultType="java.lang.Long">
         select di.merc_id
         from
         device_charging dc join device_info di on(dc.device_id = di.device_id)