update [PayPaymentRecord.java，PayMeetingSituation.java]补全字段

jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 会议报名信息
  * @Author: jero-boot
- * @Date:   2021-09-02
+ * @Date:   2021-09-07
  * @Version: V1.0
  */
 @Data
@@ -70,26 +70,95 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "企业名称")
     private String companyName;
 
-	/**姓名*/
-	@Excel(name = "姓名", width = 15)
-    @ApiModelProperty(value = "姓名")
-    private String userName;
+	/**企业联系人id*/
+	@Excel(name = "企业联系人id", width = 15)
+    @ApiModelProperty(value = "企业联系人id")
+    private String companyContactId;
 
-	/**身份*/
-	@Excel(name = "身份", width = 15)
-    @ApiModelProperty(value = "身份")
-    private Integer identity;
+	/**企业联系人姓名*/
+	@Excel(name = "企业联系人姓名", width = 15)
+    @ApiModelProperty(value = "企业联系人姓名")
+    private String companyContactName;
+
+	/**职务*/
+	@Excel(name = "职务", width = 15)
+    @ApiModelProperty(value = "职务")
+    private String post;
 
 	/**手机号*/
 	@Excel(name = "手机号", width = 15)
     @ApiModelProperty(value = "手机号")
     private String phone;
 
+	/**邮箱*/
+	@Excel(name = "邮箱", width = 15)
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+	/**身份*/
+	@Excel(name = "身份", width = 15)
+    @ApiModelProperty(value = "身份")
+    private Integer identity;
+
+	/**嘉宾类型*/
+	@Excel(name = "嘉宾类型", width = 15)
+    @ApiModelProperty(value = "嘉宾类型")
+    private Integer guestType;
+
+	/**演讲题目*/
+	@Excel(name = "演讲题目", width = 15)
+    @ApiModelProperty(value = "演讲题目")
+    private String speechTopic;
+
+	/**演讲ppt*/
+	@Excel(name = "演讲ppt", width = 15)
+    @ApiModelProperty(value = "演讲ppt")
+    private String speechPpt;
+
+	/**照片*/
+	@Excel(name = "照片", width = 15)
+    @ApiModelProperty(value = "照片")
+    private String photo;
+
+	/**个人简介*/
+	@Excel(name = "个人简介", width = 15)
+    @ApiModelProperty(value = "个人简介")
+    private String profile;
+
+	/**是否用餐*/
+	@Excel(name = "是否用餐", width = 15)
+    @ApiModelProperty(value = "是否用餐")
+    private Integer haveMeals;
+
+	/**是否回民*/
+	@Excel(name = "是否回民", width = 15)
+    @ApiModelProperty(value = "是否回民")
+    private Integer huiPeople;
+
 	/**是否入住协议酒店*/
 	@Excel(name = "是否入住协议酒店", width = 15)
     @ApiModelProperty(value = "是否入住协议酒店")
     private Integer checkInHotel;
 
+	/**入住酒店时间*/
+	@Excel(name = "入住酒店时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "入住酒店时间")
+    private java.util.Date inHotelTime;
+
+	/**离开酒店时间*/
+	@Excel(name = "离开酒店时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "离开酒店时间")
+    private java.util.Date outHotelTime;
+
+	/**房型*/
+	@Excel(name = "房型", width = 15)
+    @ApiModelProperty(value = "房型")
+    private String roomLayout;
+
 	/**抵达时间*/
 	@Excel(name = "抵达时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -97,12 +166,67 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "抵达时间")
     private java.util.Date arrivalTime;
 
+	/**到达站*/
+	@Excel(name = "到达站", width = 15)
+    @ApiModelProperty(value = "到达站")
+    private String destination;
+
+	/**到达班次*/
+	@Excel(name = "到达班次", width = 15)
+    @ApiModelProperty(value = "到达班次")
+    private String arrivalShift;
+
+	/**是否需要送站*/
+	@Excel(name = "是否需要送站", width = 15)
+    @ApiModelProperty(value = "是否需要送站")
+    private Integer deliveryStation;
+
 	/**离开时间*/
 	@Excel(name = "离开时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "离开时间")
-    private java.util.Date leaveTime;
+    private java.util.Date departureTime;
+
+	/**离开站*/
+	@Excel(name = "离开站", width = 15)
+    @ApiModelProperty(value = "离开站")
+    private String departureStation;
+
+	/**离开班次*/
+	@Excel(name = "离开班次", width = 15)
+    @ApiModelProperty(value = "离开班次")
+    private String departureShift;
+
+	/**同行人*/
+	@Excel(name = "同行人", width = 15)
+    @ApiModelProperty(value = "同行人")
+    private String peer;
+
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+	/**是否签到*/
+	@Excel(name = "是否签到", width = 15)
+    @ApiModelProperty(value = "是否签到")
+    private Integer checkIn;
+
+	/**是否需要接站*/
+	@Excel(name = "是否需要接站", width = 15)
+    @ApiModelProperty(value = "是否需要接站")
+    private Integer pickUp;
+
+	/**邮寄联系人*/
+	@Excel(name = "邮寄联系人", width = 15)
+    @ApiModelProperty(value = "邮寄联系人")
+    private String postContactId;
+
+	/**邮寄联系人地址*/
+	@Excel(name = "邮寄联系人地址", width = 15)
+    @ApiModelProperty(value = "邮寄联系人地址")
+    private String postContactAddress;
 
 	/**缴费方式*/
 	@Excel(name = "缴费方式", width = 15)
@@ -114,6 +238,11 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "需要发票")
     private Integer needInvoice;
 
+	/**付款凭证*/
+	@Excel(name = "付款凭证", width = 15)
+    @ApiModelProperty(value = "付款凭证")
+    private String paymentRecord;
+
 	/**状态（导入、未导入）*/
 	@Excel(name = "状态（导入、未导入）", width = 15)
     @ApiModelProperty(value = "状态（导入、未导入）")
@@ -124,4 +253,24 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "是否为新增")
     private Integer isNew;
 
+	/**打包*/
+	@Excel(name = "打包", width = 15)
+    @ApiModelProperty(value = "打包")
+    private Integer pack;
+
+	/**到账*/
+	@Excel(name = "到账", width = 15)
+    @ApiModelProperty(value = "到账")
+    private Integer inAccount;
+
+	/**开票*/
+	@Excel(name = "开票", width = 15)
+    @ApiModelProperty(value = "开票")
+    private Integer makeInvoice;
+
+	/**邮寄*/
+	@Excel(name = "邮寄", width = 15)
+    @ApiModelProperty(value = "邮寄")
+    private Integer mail;
+
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml

@@ -10,15 +10,44 @@
         <result column="meeting_id" property="meetingId" />
         <result column="company_id" property="companyId" />
         <result column="company_name" property="companyName" />
-        <result column="user_name" property="userName" />
-        <result column="identity" property="identity" />
+        <result column="company_contact_id" property="companyContactId" />
+        <result column="company_contact_name" property="companyContactName" />
+        <result column="post" property="post" />
         <result column="phone" property="phone" />
+        <result column="email" property="email" />
+        <result column="identity" property="identity" />
+        <result column="guest_type" property="guestType" />
+        <result column="speech_topic" property="speechTopic" />
+        <result column="speech_ppt" property="speechPpt" />
+        <result column="photo" property="photo" />
+        <result column="profile" property="profile" />
+        <result column="have_meals" property="haveMeals" />
+        <result column="hui_people" property="huiPeople" />
         <result column="check_in_hotel" property="checkInHotel" />
+        <result column="in_hotel_time" property="inHotelTime" />
+        <result column="out_hotel_time" property="outHotelTime" />
+        <result column="room_layout" property="roomLayout" />
         <result column="arrival_time" property="arrivalTime" />
-        <result column="leave_time" property="leaveTime" />
+        <result column="destination" property="destination" />
+        <result column="arrival_shift" property="arrivalShift" />
+        <result column="delivery_station" property="deliveryStation" />
+        <result column="departure_time" property="departureTime" />
+        <result column="departure_station" property="departureStation" />
+        <result column="departure_shift" property="departureShift" />
+        <result column="peer" property="peer" />
+        <result column="remark" property="remark" />
+        <result column="check_in" property="checkIn" />
+        <result column="pick_up" property="pickUp" />
+        <result column="post_contact_id" property="postContactId" />
+        <result column="post_contact_address" property="postContactAddress" />
         <result column="pay_mode" property="payMode" />
         <result column="need_invoice" property="needInvoice" />
+        <result column="payment_record" property="paymentRecord" />
         <result column="status" property="status" />
         <result column="is_new" property="isNew" />
+        <result column="pack" property="pack" />
+        <result column="in_account" property="inAccount" />
+        <result column="make_invoice" property="makeInvoice" />
+        <result column="mail" property="mail" />
     </resultMap>
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 会议报名信息
  * @Author: jero-boot
- * @Date:   2021-09-02
+ * @Date:   2021-09-07
  * @Version: V1.0
  */
 @Service

jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java

@@ -35,6 +35,10 @@ public class PayPaymentRecord implements Serializable {
 	@Excel(name = "项目id", width = 15)
     @ApiModelProperty(value = "项目id")
     private java.lang.String projectId;
+    /**项目类型*/
+    @Excel(name = "项目类型", width = 15)
+    @ApiModelProperty(value = "项目类型")
+    private java.lang.String projectType;
 	/**到账金额*/
 	@Excel(name = "到账金额", width = 15)
     @ApiModelProperty(value = "到账金额")