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

zss

昨天 599b5ff692722226d1e30fbdffc594b826bfa815

 src/main/java/com/ruoyi/home/controller/HomeController.java

@@ -192,7 +192,7 @@
    @GetMapping("/productionAccountingAnalysis")
    @ApiOperation("生产核算分析")
    public AjaxResult productionAccountingAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
        List<MapDto> list = homeService.productionAccountingAnalysis(type);
        List<ProductionAccountingDto> list   = homeService.productionAccountingAnalysis(type);
        return AjaxResult.success(list);
    }