Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java

@@ -206,7 +206,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
 			}
 		}
 		if (!errorMessage.isEmpty()) {
-			throw new JeroBootException("excel导入失败，错误信息为</br>"+errorMessage);
+			throw new JeroBootException("excel导入失败，错误信息为"+errorMessage);
 		}
 		return Result.OK("文件导入成功！");
     }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.common.util.PasswordUtil;
+import com.jero.meeting.valid.group.CommonPeople;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -19,6 +20,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -159,6 +161,11 @@ public class TbMemberProjectSubitem implements Serializable {
     @ApiModelProperty(value = "来款用途（字典表）")
     private String chargeUse;
 
+    /**缴费方式*/
+    @Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
+    @Dict(dicCode = "meeting_pay_type")
+    private Integer payMode;
+
     /**标协缴费表id*/
     @ApiModelProperty(value = "标协缴费表id")
     private String tbPaymentId;