From b34f6cf4c5d3f79369aeb4b7dbcdfbc54fbe3055 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Thu, 16 Sep 2021 15:29:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E7=A5=A8=E6=80=BB?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml     | 2 +-
 .../main/java/com/jero/project/vo/PayCommonProjectOutput.java  | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
index 246ccd15..9129353e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
@@ -4,7 +4,7 @@
 
 <!--    到账开票主列表-->
     <select id="mainList" resultType="com.jero.project.entity.PayCommonProject">
-        select p.id,p.charge_project, p.charge_use, p.principal_id,p.principal_name,p.charge_company_temporary_name,p.receivable_amount,p.paid_amount,p.need_invoice,p.pack,p.in_account,p.make_invoice,p.mail,p.create_time,p.projectType
+        select p.id,p.charge_project, p.charge_use, p.principal_id,p.principal_name,p.charge_company_temporary_name,p.receivable_amount,p.paid_amount,p.need_invoice,p.pack,p.in_account,p.make_invoice,p.mail,p.create_time,p.projectType,p.invoice_amount
         from
         (<!-- 普通项目-->
         select c.id,c.charge_project, c.charge_use, c.principal_id,c.principal_name,c.charge_company_temporary_name,c.receivable_amount,c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,c.invoice_amount
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java
index ac201104..3b0d5dbd 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/PayCommonProjectOutput.java
@@ -14,7 +14,4 @@ public class PayCommonProjectOutput extends PayCommonProject implements Serializ
     @Excel(name = "来款用途", width = 20,orderNum = "1")
     @ApiModelProperty(value = "来款用途")
     private String chargeUse_dictText;
-
-    @ApiModelProperty(value = "累加开票金额")
-    private String invoiceAmount;
 }