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

zss

2 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java

@@ -194,4 +194,8 @@

    private Long productModelId;

    @ApiModelProperty(value = "是否冻结(0:未冻结 1:已冻结)")
    @Excel(name = "是否冻结")
    private Boolean isFrozen;

}