Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-05-16 88b41b938164a5b62ed0a31cd6d8876a2a934776

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

@@ -140,6 +140,7 @@

    /**
     * 根据灯杆id查找费率
     *
     * @param poleId
     * @return
     */
@@ -151,4 +152,8 @@
        Long c3Id = chargingMapper.getAllByC3Mac(one.getDeviceCode()).getC3Id();
        return getChargeByC3Id(c3Id.intValue());
    }

    public boolean deleteC3mCharging(Integer c3mId) {
        return c3mChargingChargeMapper.deleteCharge(c3mId);
    }
}