Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

2 天以前 7a9bd9b7da7c4943e8b5853d4d7de5cba72f3de0

 src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java

@@ -62,6 +62,14 @@
        return save ? AjaxResult.success() : AjaxResult.error();
    }

    @PostMapping("/addBatch")
    @ApiOperation("设备能耗-批量新增")
    @Log(title = "设备能耗-批量新增", businessType = BusinessType.INSERT)
    public AjaxResult addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
        boolean save = equipmentEnergyConsumptionService.saveBatch(list);
        return save ? AjaxResult.success() : AjaxResult.error();
    }

    @PostMapping("/update")
    @ApiOperation("设备能耗-修改")
    @Log(title = "设备能耗-修改", businessType = BusinessType.UPDATE)