Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-17 f37b3d71b2ce011e938cc3bf1fddc1c5fd14e15b

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java

@@ -92,8 +92,7 @@
    @DeleteMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
        TChargingGun chargingGun = chargingGunService.getById(id);
        chargingGun.setDelFlag(true);
        chargingGunService.updateById(chargingGun);
        chargingGunService.removeById(chargingGun);
        return AjaxResult.success();
    }