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

zhuo

2025-04-21 09c297c75f036f017dedfb163e338c6c427477d5

 basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java

@@ -121,4 +121,7 @@

    @ApiModelProperty("免检")
    private Integer isExemption;

    @ApiModelProperty("原材料id(导出用)")
    private String ids;
}