From bf8f34752cc7584193d490cd6c1fe5850d31a269 Mon Sep 17 00:00:00 2001
From: yanghb <yangbhwork@163.com>
Date: 星期三, 07 五月 2025 16:27:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementBatch/PlacementAssetTemplateResponse.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementBatch/PlacementAssetTemplateResponse.java b/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementBatch/PlacementAssetTemplateResponse.java
index 4f6baf0..e88e645 100644
--- a/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementBatch/PlacementAssetTemplateResponse.java
+++ b/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementBatch/PlacementAssetTemplateResponse.java
@@ -41,13 +41,13 @@
@ApiModelProperty(value = "所有家庭人员应安置面积(m²)")
private BigDecimal resettledArea;
- @ExcelProperty(value = {"补偿单价标准", "新建商品房、商业用房、停车位"}, index = 7, converter = BigDecimalConverter.class)
+ @ExcelProperty(value = {"补偿单价标准", "新建商品房、商业用房、停车位"}, index = 7, converter = StringConverter.class)
@ApiModelProperty(value = "补偿单价标准-新建商品房、商业用房、停车位")
- private BigDecimal priceNewAmount;
+ private String priceNewAmount;
- @ExcelProperty(value = {"补偿单价标准", "二手住房"}, index = 8, converter = BigDecimalConverter.class)
+ @ExcelProperty(value = {"补偿单价标准", "二手住房"}, index = 8, converter = StringConverter.class)
@ApiModelProperty(value = "补偿单价标准-二手住房")
- private BigDecimal priceOldAmount;
+ private String priceOldAmount;
@ExcelProperty(value = "补偿总价(万元)", index = 9, converter = BigDecimalConverter.class)
@ApiModelProperty(value = "补偿总价(万元)")
@@ -74,8 +74,8 @@
exampleData.setIdCard("123456789012345678");
exampleData.setResettledNum(3);
exampleData.setResettledArea(new BigDecimal("120.5"));
- exampleData.setPriceNewAmount(new BigDecimal("20000"));
- exampleData.setPriceOldAmount(new BigDecimal("15000"));
+ exampleData.setPriceNewAmount("20000");
+ exampleData.setPriceOldAmount("15000");
exampleData.setCompensationAmount(new BigDecimal("330.75"));
exampleData.setDownPaymentAmount(new BigDecimal("82.6875"));
exampleData.setQuarterPayAmount(new BigDecimal("25"));
--
Gitblit v1.7.1