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

yaowanxin

21 小时以前 dcf2c669cac48202ceea2d6917dff89b9a84cb95

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

@@ -23,7 +23,5 @@

    private String productName;


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