From f0fd4f7fb31a113b8d29689b1a6b6872d8a288fb Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 13 Jan 2022 17:25:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E5=92=8C=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/meeting/controller/PayMeetingController.java |  2 ++
 .../main/java/com/jero/meeting/entity/PayMeeting.java | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 085995d3..6f0958cd 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -153,6 +153,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                 meeting.setRegisterCheckResult(registerCheckResult);
                 meeting.setSituationId(meetingSituation.getId());
                 meeting.setPayMode(meetingSituation.getPayMode());
+                meeting.setIdentity(meetingSituation.getIdentity());
+                meeting.setPaymentRecord(meetingSituation.getPaymentRecord());
                 Integer checkResult = meetingSituation.getCheckResult();
                 String paymentRecord = meetingSituation.getPaymentRecord();
                 Integer checkIn = meetingSituation.getCheckIn();
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
index 7f4883bf..bb73a3c0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
@@ -325,4 +325,15 @@ public class PayMeeting implements Serializable {
     @ApiModelProperty(value = "会议联系人")
     @TableField(exist = false)
     private List<PayMeetingContacts> meetingContactsList;
+
+    /**身份*/
+    @ApiModelProperty(value = "身份")
+    @TableField(exist = false)
+    @Dict(dicCode = "meet_identify_type")
+    private Integer identity;
+
+    /**缴费凭证*/
+    @ApiModelProperty(value = "缴费凭证")
+    @TableField(exist = false)
+    private String paymentRecord;
 }