Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/DeviceAlgorithmChargingServiceImpl.java

@@ -76,7 +76,7 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
                 .in(DeviceAlgorithmCharging::getBeginTime, Arrays.asList(DataTime.getSring("yyyyMM"), -1))
         );
         if (!Emptys.check(deviceAlgorithmChargings)) {
-            throw new CommRuntimeException("设备欠费，请充值");
+            throw new CommRuntimeException("算法费欠费");
         }
         return R.ok();
     }

device-api-service/src/main/java/com/xy/service/DeviceChargingServiceImpl.java

@@ -111,11 +111,11 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                     .setTimeout(now)
                     .setCreateTime(now)
             );
-            throw new CommRuntimeException("设备欠费，请充值");
+            throw new CommRuntimeException("管理费欠费");
         }
         int contrast = DataTime.stringContrast(DataTime.toString(deviceCharging.getTimeout()), DataTime.toString(now));
         if (deviceCharging.getChargingX() == 0 && contrast <= 0) {
-            throw new CommRuntimeException("设备欠费，请充值");
+            throw new CommRuntimeException("管理费欠费");
         }
         return R.ok();
     }