Merge branch 'dev_ztns' into dev_ywx_ztns

zouyu

2025-07-25 ff1dcdad798b3fd484439e8a87a4d0ac75ab5720

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

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

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

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