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

maven

3 天以前 6d5f8d5dd6f337837c7a0007639490afe3c7409c

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

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

    @PostMapping("/addBatch")
    @ApiOperation("用电时段-批量新增")
    @Log(title = "用电时段-批量新增", businessType = BusinessType.INSERT)
    public AjaxResult addBatch(@RequestBody List<EnergyPeriod> energyPeriods) {
        boolean save = energyPeriodService.saveBatch(energyPeriods);
        return save ? AjaxResult.success() : AjaxResult.error();
    }

    @PostMapping("/update")
    @ApiOperation("用电时段-修改")
    @Log(title = "用电时段-修改", businessType = BusinessType.UPDATE)