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

gongchunyi

昨天 1bc0c6c7842e29711e576e58b0aca00fabd92df0

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

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

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

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

    List<ProductWorkOrderDto> selectWorkOrderStartStats(@Param("startDate") String startDate, @Param("endDate") String endDate);
}