From a7cc8e3f542631b4c198461d5a904db9e2dcf58b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Aug 2024 14:49:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=2087993=20=E4=B8=AA=E4=BA=BA=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E7=BB=9F=E8=AE=A1=E8=AF=A6=E6=83=85-=E5=AF=BC?= =?UTF-8?q?=E5=87=BA-=E6=9C=89=E4=BB=A5=E4=B8=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/PrincipalPeopleDetail.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java index 3f5ebb4b..1005528f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java @@ -16,13 +16,20 @@ public class PrincipalPeopleDetail { @ApiModelProperty(value = "项目id") private String id; + @Excel(name = "来款项目", width = 15) + @ApiModelProperty(value = "来款项目") + private String projectName; + @Excel(name = "来款企业", width = 15) @ApiModelProperty(value = "来款企业") private String chargeCompanyTemporaryName; - @Excel(name = "来款项目", width = 15) - @ApiModelProperty(value = "来款项目") - private String projectName; + @ApiModelProperty(value = "打包") + private Integer pack; + + @Excel(name = "是否打包", width = 15) + @ApiModelProperty(value = "打包") + private String packText; @Excel(name = "年度待确收金额", width = 15) @ApiModelProperty(value = "合同金额") @@ -40,13 +47,6 @@ public class PrincipalPeopleDetail { @ApiModelProperty(value = "到账金额") private String comeAllMoney; - @ApiModelProperty(value = "打包") - private Integer pack; - - @Excel(name = "打包", width = 15) - @ApiModelProperty(value = "打包") - private String packText; - @ApiModelProperty(value = "来款用途编码") private String chargeUse;