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

liyong

2026-05-27 d14764d097691d35e7015c2d161c612aa7642a8e

 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;
}