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

liyong

2026-04-25 0d9b0dab20eae44c817944e98c967dfd8832f580

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

@@ -21,7 +21,10 @@
    private String num;
    private String numSuffix = "张";
    private String unit;
    private String unitSuffix = "元/kg";
    private String unitSuffix = "kg";
    private String price;
    private String priceSuffix = "元/kg";
    private String totalAmount;

    private String productModelId;
}