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/placementApply/PlacementApplyTemplateResponse.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementApply/PlacementApplyTemplateResponse.java b/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementApply/PlacementApplyTemplateResponse.java
index de4d0d6..6b1b4f1 100644
--- a/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementApply/PlacementApplyTemplateResponse.java
+++ b/cz-bussiness/src/main/java/com/ruoyi/bussiness/object/response/placementApply/PlacementApplyTemplateResponse.java
@@ -75,12 +75,12 @@
private BigDecimal waitFamilyArea;
@ApiModelProperty(value = "补偿金额(万元)-新建商品住房、商业用房、停车位")
- @ExcelProperty(value = {"补偿金额(万元)","新建商品住房、商业用房、停车位"}, index = 14, converter = BigDecimalConverter.class)
- private BigDecimal compensationNewAmount;
+ @ExcelProperty(value = {"补偿金额(万元)","新建商品住房、商业用房、停车位"}, index = 14, converter = StringConverter.class)
+ private String compensationNewAmount;
@ApiModelProperty(value = "补偿金额(万元)-二手住房")
- @ExcelProperty(value = {"补偿金额(万元)","二手住房"}, index = 15, converter = BigDecimalConverter.class)
- private BigDecimal compensationOldAmount;
+ @ExcelProperty(value = {"补偿金额(万元)","二手住房"}, index = 15, converter = StringConverter.class)
+ private String compensationOldAmount;
@ApiModelProperty(value = "补偿金额（合计）")
@ExcelProperty(value = {"补偿金额(万元)","合计"}, index = 16, converter = BigDecimalConverter.class)
@@ -122,9 +122,9 @@
exampleData.setCurrentCount(1);
exampleData.setWaitFamilyNames("示例外家庭成员");
exampleData.setWaitFamilyArea(new BigDecimal("100.50"));
- exampleData.setCompensationNewAmount(new BigDecimal("500.00"));
- exampleData.setCompensationOldAmount(new BigDecimal("300.00"));
- exampleData.setCompensationSum(new BigDecimal("800.00"));
+ exampleData.setCompensationNewAmount("200");
+ exampleData.setCompensationOldAmount("300.00");
+ exampleData.setCompensationSum(new BigDecimal("500.00"));
exampleData.setDownPaymentAmount(new BigDecimal("200.00"));
exampleData.setQuarterPayAmount(new BigDecimal("50.00"));
exampleData.setSubsidyAmount(new BigDecimal("100.00"));
--
Gitblit v1.7.1