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

zss

2 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

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

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

    private Long productId;

    private String productName;

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