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

maven

2 天以前 61b1802b1b26fc35c07fd09edc4ff2ff8ade6688

 src/main/java/com/ruoyi/production/mapper/ProductWorkOrderMapper.java

@@ -17,5 +17,5 @@

    IPage<ProductWorkOrderDto> pageProductWorkOrder(Page<ProductWorkOrderDto> page, @Param("c") ProductWorkOrderDto productWorkOrder);

    List<ProductWorkOrderDto> selectProductWorkOrderDtoList();
    ProductWorkOrderDto getProductWorkOrderFlowCard(@Param("id") Long id);
}