Merge branch 'master' into prod

device-api-service/src/main/java/com/xy/job/DeviceAlgorithmChargingJob.java

@@ -39,6 +39,8 @@ import java.util.Map;
 @AllArgsConstructor
 public class DeviceAlgorithmChargingJob {
 
+    private MercService mercService;
+
     private MercAccountService mercAccountService;
 
     private DeviceInfoServiceImpl deviceInfoService;
@@ -47,8 +49,6 @@ public class DeviceAlgorithmChargingJob {
 
     private MercArrearageConfigService mercArrearageConfigService;
 
-    private MercService mercService;
-
     /**
      * 算法费设备停机
      *