From 803102f20663b65634c36c6afacc1972bd406fa1 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Fri, 22 Jan 2021 09:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=91=E7=A5=A8=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=93=E7=AE=97=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/fantang/domain/FtInvoiceDao.java  |  5 +++++
 .../com/ruoyi/system/fantang/domain/FtSettleDao.java   | 10 ++++++++++
 .../resources/mapper/fantang/FtInvoiceDaoMapper.xml    |  1 +
 .../resources/mapper/fantang/FtSettleDaoMapper.xml     |  2 ++
 4 files changed, 18 insertions(+)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtInvoiceDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtInvoiceDao.java
index 499fb9957..038c9b913 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtInvoiceDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtInvoiceDao.java
@@ -79,4 +79,9 @@ private static final long serialVersionUID=1L;
      * 开票类型
      */
     private Integer invoiceType;
+
+    /**
+     * 开票金额
+     */
+    private BigDecimal invoiceAmount;
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java
index e6cdce086..114795bfd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java
@@ -106,4 +106,14 @@ public class FtSettleDao implements Serializable {
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date selectBillingDate;
+
+    /**
+     * 开票标志
+     */
+    private Boolean invoiceFlag;
+
+    /**
+     * 发票 id
+     */
+    private Long invoiceId;
 }
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtInvoiceDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtInvoiceDaoMapper.xml
index d0333be41..7e4a70f97 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtInvoiceDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtInvoiceDaoMapper.xml
@@ -18,6 +18,7 @@
         <result property="invoiceName" column="invoice_name"/>
         <result property="taxId" column="tax_id"/>
         <result property="invoiceType" column="invoice_type"/>
+        <result property="invoiceAmount" column="invoice_amount"/>
     </resultMap>
 
 
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtSettleDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtSettleDaoMapper.xml
index a4e72692c..40cbf6a69 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtSettleDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtSettleDaoMapper.xml
@@ -16,6 +16,8 @@
         <result property="type" column="type"/>
         <result property="flag" column="flag"/>
         <result property="refund" column="refund"/>
+        <result property="invoiceId" column="invoice_id"/>
+        <result property="invoiceFlag" column="invoice_flag"/>
     </resultMap>