From fe25355cf652af615945d0deabb9f5dbaf8aad4c Mon Sep 17 00:00:00 2001
From: zhangqinlin <>
Date: Wed, 13 Jul 2022 10:23:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AF=BC=E5=87=BA=E7=A1=AE=E6=94=B6?=
 =?UTF-8?q?=E7=8E=87=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/statistics/entity/CompanyComeMoneyList.java  | 8 +++++---
 .../java/com/jero/statistics/entity/DepartStatistics.java | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java
index 0595d3ed..2598e8b0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyList.java
@@ -26,6 +26,10 @@ public class CompanyComeMoneyList {
     @ApiModelProperty(value = "确认收入金额")
     private String confirmAmount;
 
+    @Excel(name = "确收率", width = 15)
+    @ApiModelProperty(value = "确收率")
+    private String finishRate;
+
     @Excel(name = "开票金额", width = 15)
     @ApiModelProperty(value = "开票金额")
     private String billMoney;
@@ -34,7 +38,5 @@ public class CompanyComeMoneyList {
     @ApiModelProperty(value = "到账总金额")
     private String comeAllMoney;
 
-    @Excel(name = "确收率", width = 15)
-    @ApiModelProperty(value = "确收率")
-    private String finishRate;
+
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java
index d543bff1..fbdcee57 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/DepartStatistics.java
@@ -22,6 +22,10 @@ public class DepartStatistics {
     @ApiModelProperty(value = "确认收入金额")
     private String confirmAmount;
 
+    @Excel(name = "确收率", width = 15)
+    @ApiModelProperty(value = "确收率")
+    private String finishRate;
+
     @Excel(name = "开票金额", width = 15)
     @ApiModelProperty(value = "开票金额")
     private String billMoney;
@@ -30,9 +34,7 @@ public class DepartStatistics {
     @ApiModelProperty(value = "到账总金额")
     private String comeAllMoney;
 
-    @Excel(name = "确收率", width = 15)
-    @ApiModelProperty(value = "确收率")
-    private String finishRate;
+
 
 
 }