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

maven

18 小时以前 f4e70436bb93ab6cc7e2b8c27afa9a5978371855

 src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java

@@ -21,7 +21,9 @@

    private Long productId;

    private String productName;


    private List<ProductProcessRouteItem> processRouteItem;
    private String specificationModel;
    private String model;
}