Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-09-27 a49686ae25f3fc71306a1fd9ed117e8ca89da65b

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java

@@ -61,7 +61,7 @@
    }

    @ApiOperation("补片流程卡明细查询接口")
    @SaCheckPermission("printFlowCard.search")
    @SaCheckPermission("printReplenishFlowCard.search")
    @PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
    public Result selectPrint(
            @PathVariable Date selectTime1,

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java

@@ -60,7 +60,7 @@
    }

    @ApiOperation("返工流程卡明细查询接口")
    @SaCheckPermission("printFlowCard.search")
    @SaCheckPermission("printReworkFlowCard.search")
    @PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
    public Result selectPrint(
            @PathVariable Date selectTime1,