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

yaowanxin

2025-08-04 b290cb0452d5731694e6ffe46e8f6eb5fec645a6

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

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

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

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