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

liyong

8 天以前 ff181c705c98885282668990c84219d17e04be0b

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

@@ -99,7 +99,7 @@
    @GetMapping("/workInProcessTurnover")
    @ApiOperation("在制品周转情况")
    public AjaxResult workInProcessTurnover(){
        Map<Integer, List<ProductWorkOrderDto>> productWorkOrderDtoMap = homeService.workInProcessTurnover();
        return AjaxResult.success(productWorkOrderDtoMap);
        ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
        return AjaxResult.success(productionTurnoverDto);
    }
}