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

maven

6 天以前 fe2d7c404c69700404814e18a70d5e606916486b

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

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

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

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