From 078c7ff89e2cdac2c32a97c7daae465395111bff Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 12:01:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=2087938=20=E4=BC=81=E4=B8=9A=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E8=AF=A6=E6=83=85=E5=AF=BC=E5=87=BA=20=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistics/entity/CompanyComeMoneyDetail.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java index 11633b1a..60e1e8b0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java @@ -18,12 +18,16 @@ public class CompanyComeMoneyDetail { @ApiModelProperty(value = "来款项目") private String projectName; - @Excel(name = "年度待确收金额", width = 15) + @Excel(name = "来款企业", width = 15) @ApiModelProperty(value = "来款企业") private String chargeCompanyName; - @Excel(name = "合同金额", width = 15) - @ApiModelProperty(value = "合同金额") + @Excel(name = "是否打包") + @ApiModelProperty(value = "打包") + private String packText; + + @Excel(name = "年度待确收金额", width = 15) + @ApiModelProperty(value = "年度待确收金额") private String allMoney; @Excel(name = "确认收入金额", width = 15) @@ -44,9 +48,7 @@ public class CompanyComeMoneyDetail { @ApiModelProperty(value = "打包") private Integer pack; - @Excel(name = "打包") - @ApiModelProperty(value = "打包") - private String packText; + @Excel(name = "来款用途") @ApiModelProperty(value = "来款用途")