From 7a6dd6ed44365f71411b9faf0c4b01acc007ad92 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Wed, 9 Dec 2020 16:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B7=E5=AE=A1=E4=BC=9Atime=E6=94=B9?=
 =?UTF-8?q?=E6=88=90passing=5Ftime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/guarantee/DgLoanCommitteeConsiderMapper.xml          | 2 +-
 .../framework/domain/guarantee/DgLoanCommitteeConsider.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml
index 444d0d27..187ad266 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml
@@ -107,7 +107,7 @@
     </select>
 
     <select id="query" parameterType="integer" resultType="com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider">
-        SELECT agreed_items,additional_items,loan_money,loan_tern,agree_person,disagree_person,file,passing_time AS time,refuse_opinion
+        SELECT agreed_items,additional_items,loan_money,loan_tern,agree_person,disagree_person,file,passing_time,refuse_opinion
         FROM dg_loan_committee_consider
         WHERE id = #{id}
     </select>
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java
index c89075b4..418e40c9 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgLoanCommitteeConsider.java
@@ -78,7 +78,7 @@ public class DgLoanCommitteeConsider implements Serializable {
      * 贷审会时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private Date time;
+    private Date passingTime;
 
     /**
      * 同意（贷审委员）