update 更改金额类型为BigDecimal

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

@@ -176,12 +176,12 @@ public class PayMeeting implements Serializable {
 	/**会议费用*/
 	@Excel(name = "会议费用", width = 15)
     @ApiModelProperty(value = "会议费用")
-    private Integer meetingCosts;
+    private BigDecimal meetingCosts;
 
 	/**会议费用（标协会员）*/
 	@Excel(name = "会议费用（标协会员）", width = 15)
     @ApiModelProperty(value = "会议费用（标协会员）")
-    private Integer meetingCostsVip;
+    private BigDecimal meetingCostsVip;
 
 	/**会议负责人id*/
 	@Excel(name = "会议负责人", width = 15,dictTable = "sys_user",dicText = "username",dicCode = "id")

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

@@ -16,6 +16,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+
 /**
  * @Description: 会议报名信息
  * @Author: jero-boot
@@ -65,6 +68,12 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "企业id")
     private String companyId;
 
+    /**
+     * 企业临时id
+     */
+    @Excel(name = "会员单位", width = 15, dictTable = "pay_company_management_temporary", dicText = "company_name", dicCode = "id",orderNum = "1")
+    private String companyTemporaryId;
+
 	/**企业名称*/
 	@Excel(name = "企业名称", width = 15)
     @ApiModelProperty(value = "企业名称")
@@ -75,6 +84,12 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "企业联系人id")
     private String companyContactId;
 
+    /**
+     * 企业联系人临时id
+     */
+    @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
+    private String companyContactTemporaryId;
+
 	/**企业联系人姓名*/
 	@Excel(name = "企业联系人姓名", width = 15)
     @ApiModelProperty(value = "企业联系人姓名")
@@ -223,6 +238,18 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "邮寄联系人")
     private String postContactId;
 
+    /**
+     * 邮寄联系人临时id
+     */
+    @Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
+    private String postContactTemporaryId;
+
+    /**
+     * 邮寄联系人姓名
+     */
+    @ApiModelProperty(value = "邮寄联系人姓名")
+    private String postContactName;
+
 	/**邮寄联系人地址*/
 	@Excel(name = "邮寄联系人地址", width = 15)
     @ApiModelProperty(value = "邮寄联系人地址")
@@ -253,6 +280,18 @@ public class PayMeetingSituation implements Serializable {
     @ApiModelProperty(value = "是否为新增")
     private Integer isNew;
 
+    /**
+     * 应收金额
+     */
+    @ApiModelProperty(value = "应收金额")
+    private BigDecimal amountReceivable;
+
+    /**
+     * 实收金额
+     */
+    @ApiModelProperty(value = "实收金额")
+    private BigDecimal paidAmount;
+
 	/**打包*/
 	@Excel(name = "打包", width = 15)
     @ApiModelProperty(value = "打包")