Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

9 天以前 2d03ec79e1892248b520cf097e8a58dd82a4892f

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

@@ -25,6 +25,7 @@
    private String price;
    private String priceSuffix = "元/kg";
    private String totalAmount;
    private String parentId;

    private String productModelId;
}