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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 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;

    private Boolean isComplete;
}