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

liyong

2026-05-21 8e89f95b9db4039f0cb8b4b8dc7974c247366c4c

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