Merge remote-tracking branch 'origin/master'

yanghb

2025-05-07 bf8f34752cc7584193d490cd6c1fe5850d31a269

 cz-bussiness/src/main/java/com/ruoyi/bussiness/domain/PlacementBatchAsset.java

@@ -53,10 +53,10 @@
    private Integer waitFamilyAreaWarn;

    @ApiModelProperty(value = "补偿单价标准-新建商品房、商业用")
    private BigDecimal priceNewAmount;
    private String priceNewAmount;

    @ApiModelProperty(value = "补偿单价标准-二手住房")
    private BigDecimal priceOldAmount;
    private String priceOldAmount;

    @ApiModelProperty(value = "多个购房情况警告（新建房和二手住房都录入了）")
    private Integer twoPriceWarn;