Merge remote-tracking branch 'origin/system_fee' into system_fee

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageListDto.java

@@ -103,6 +103,8 @@ public class StudentManageListDto {
     private String cooperationOrganName;
 
     private Integer memberRankSettingId;
+    
+    private Date membershipEndTime;
 
     public Integer getMemberRankSettingId() {
         return memberRankSettingId;
@@ -421,4 +423,12 @@ public class StudentManageListDto {
     public void setNoStartPracticeCourseNum(Integer noStartPracticeCourseNum) {
         this.noStartPracticeCourseNum = noStartPracticeCourseNum;
     }
+
+	public Date getMembershipEndTime() {
+		return membershipEndTime;
+	}
+
+	public void setMembershipEndTime(Date membershipEndTime) {
+		this.membershipEndTime = membershipEndTime;
+	}
 }