Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-12-30 b9903ead016b8b1aa68eb04b48fca3b53fdab0d3

 src/main/java/com/mzl/flower/web/v2/statisticsAnalysis/StatisticAnalysisController.java

@@ -51,7 +51,7 @@
    @ApiOperation(value = "花材统计-统计", notes = "花材统计统计")
    public ResponseEntity<ReturnDataDTO<FlowerMaterialStaticVO>> getFlowerMaterialStatis(@Validated FlowerMaterialDTO dto
    ) {
        return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(statisticAnalysisService.getFlowerMaterialStatis(dto), FlowerSaleStatisticVO.class));
        return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(statisticAnalysisService.getFlowerMaterialStatis(dto), FlowerMaterialStaticVO.class));
    }