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

liyong

13 小时以前 1765150bd38a53f6466a6e355f231e21f25fc9f2

 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);
}