Merge remote-tracking branch 'origin/master'

liuhaonan

2022-08-26 c86ed59bbb89f1a83425a380735a2c788e45d054

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mChargingChargeService.java

@@ -59,7 +59,7 @@
        if (byId == null) {
            throw new BusinessException("c3Id不存在");
        }
        String s = chargingService.setRate(byId.getC3Mac(), chargeEntities);
        String s = chargingService.setRate(byId.getC3Mac(), chargeEntities,false);
        if (!"操作成功".equals(s)) {
            throw new BusinessException("设置失败,失败原因: " + s);
        }