Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/LoginEntity.java

@@ -1,6 +1,8 @@
 package com.ym.mec.auth.api.entity;
 
-public class LoginEntity {
+import com.ym.mec.common.entity.BaseEntity;
+
+public class LoginEntity extends BaseEntity {
     private String smsCode;
 
     private String clientId;
@@ -13,8 +15,6 @@ public class LoginEntity {
     
     private String deviceNum;
     
-    private String tenantId;
-    
     private String organId;
 
     public Boolean getIsRegister() {
@@ -65,14 +65,6 @@ public class LoginEntity {
 		this.deviceNum = deviceNum;
 	}
 
-	public String getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(String tenantId) {
-		this.tenantId = tenantId;
-	}
-
 	public String getOrganId() {
 		return organId;
 	}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysMenu.java

@@ -1,14 +1,17 @@
 package com.ym.mec.auth.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 import java.util.List;
 
 /**
  * 对应数据库表(sys_menu):
  */
-public class SysMenu {
+public class SysMenu extends BaseEntity {
 
 	/** 菜单ID */
 	@ApiModelProperty(value = "菜单ID",required = false)

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysRole.java

@@ -6,10 +6,12 @@ import java.util.List;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(sys_role):
  */
-public class SysRole {
+public class SysRole extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysRoleDept.java

@@ -1,12 +1,15 @@
 package com.ym.mec.auth.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(sys_role_dept):
  */
-public class SysRoleDept {
+public class SysRoleDept extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysRoleMenu.java

@@ -1,12 +1,15 @@
 package com.ym.mec.auth.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(sys_role_menu):
  */
-public class SysRoleMenu {
+public class SysRoleMenu extends BaseEntity {
 
 	/** 角色ID */
 	@ApiModelProperty(value = "角色ID",required = false)

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -10,11 +10,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
+import com.ym.mec.common.entity.BaseEntity;
 
 /**
  * 对应数据库表(sys_user):
  */
-public class SysUser implements Serializable{
+public class SysUser extends BaseEntity implements Serializable{
 
 	/**
 	 *
@@ -24,9 +25,6 @@ public class SysUser implements Serializable{
 	/** 主键ID */
 	private Integer id;
 	
-	/** 机构编号 */
-	private Integer tenantId;
-
 	/** 用户名 */
 	@ApiModelProperty(value = "用户名",required = false)
 	private String username;
@@ -228,14 +226,6 @@ public class SysUser implements Serializable{
 		this.id = id;
 	}
 
-	public Integer getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(Integer tenantId) {
-		this.tenantId = tenantId;
-	}
-
 	public void setUsername(String username) {
 		this.username = username;
 	}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserDevice.java

@@ -4,10 +4,12 @@ import java.util.Date;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(sys_user_device):
  */
-public class SysUserDevice {
+public class SysUserDevice extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserLogin.java

@@ -1,12 +1,15 @@
 package com.ym.mec.auth.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(sys_user_login):
  */
-public class SysUserLogin {
+public class SysUserLogin extends BaseEntity {
 
 	/**  */
 	@ApiModelProperty(value = "用户编号",required = false)

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserLoginLog.java

@@ -1,12 +1,15 @@
 package com.ym.mec.auth.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(sys_user_login_log):
  */
-public class SysUserLoginLog {
+public class SysUserLoginLog extends BaseEntity {
 
 	private Long id;
 

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUserRole.java

@@ -1,12 +1,15 @@
 package com.ym.mec.auth.api.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(sys_user_role):
  */
-public class SysUserRole {
+public class SysUserRole extends BaseEntity {
 	//分部经理
 	public static Integer SECTION_MANAGER = 3;
 	//教务老师、乐团主管

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -75,7 +75,7 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 		loginEntity.setIsRegister(isRegister);
 		loginEntity.setDeviceNum(deviceNum);
 		loginEntity.setOrganId(organId);
-		loginEntity.setTenantId(tenantId);
+		loginEntity.setTenantId(Integer.parseInt(tenantId));
 
 		authRequest = new PhoneAuthenticationToken(SecurityConstants.PHONE_PRINCIPAL_PREFIX + principal, loginEntity);
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserService.java

@@ -103,7 +103,7 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @param clientId
 	 * @return
 	 */
-	SysUserInfo initUser(String tenantId, String organId, String phone,String clientId);
+	SysUserInfo initUser(Integer tenantId, String organId, String phone,String clientId);
 
 	/**
 	 * 刷新token

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -153,7 +153,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public SysUserInfo initUser(String tenantId, String organId, String phone,String clientId) {
+	public SysUserInfo initUser(Integer tenantId, String organId, String phone,String clientId) {
 		if(StringUtils.equalsIgnoreCase(clientId,"TEACHER")){
 			SysUser sysUser = new SysUser();
 			sysUser.setPhone(phone);

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentStudentMemberCourseDetailDao.java

@@ -1,7 +0,0 @@
-package com.ym.mec.biz.dal.dao;
-
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentStudentMemberCourseDetail;
-import com.ym.mec.common.dal.BaseDAO;
-
-public interface MusicGroupPaymentStudentMemberCourseDetailDao extends BaseDAO<Long, MusicGroupPaymentStudentMemberCourseDetail> {
-}

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

@@ -1,28 +1,26 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.PeriodEnum;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 
 import static com.ym.mec.biz.dal.enums.PeriodEnum.MONTH;
 
 public class CalenderMemberDto {
-    //会员周期
+    @ApiModelProperty(value = "会员周期", required = false)
     private PeriodEnum periodEnum = MONTH;
 
-    //会员数量
+    @ApiModelProperty(value = "会员数量", required = false)
     private Integer memberNum = 1 ;
 
-    //会员现价
+    @ApiModelProperty(value = "会员现价", required = false)
     private BigDecimal actualAmount = BigDecimal.ZERO;
 
-    //会员原价
-    private BigDecimal originalAmount = BigDecimal.ZERO;
-
-    //会员等级编号
+    @ApiModelProperty(value = "会员等级编号", required = false)
     private Integer memberRankSettingId = 1;
 
-    //是否可选
+    @ApiModelProperty(value = "是否可选", required = false)
     private Boolean optionalFlag = false;
 
     public PeriodEnum getPeriodEnum() {
@@ -49,14 +47,6 @@ public class CalenderMemberDto {
         this.actualAmount = actualAmount;
     }
 
-    public BigDecimal getOriginalAmount() {
-        return originalAmount;
-    }
-
-    public void setOriginalAmount(BigDecimal originalAmount) {
-        this.originalAmount = originalAmount;
-    }
-
     public Integer getMemberRankSettingId() {
         return memberRankSettingId;
     }

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

@@ -0,0 +1,144 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MusicGroupPaymentBaseCalender {
+
+	@ApiModelProperty(value = "乐团编号", required = true)
+	private String musicGroupId;
+
+	private MusicGroup musicGroup;
+
+	private Integer musicGroupOrganizationCourseSettingId;
+
+	@ApiModelProperty(value = "学校缴费、个人缴费", required = true)
+	private PayUserType payUserType;
+
+	@ApiModelProperty(value = "缴费类型", required = true)
+	private PaymentType paymentType;
+
+	@ApiModelProperty(value = "缴费开始时间", required = true)
+	private Date startPaymentDate;
+
+	@ApiModelProperty(value = "缴费截止时间", required = true)
+	private Date deadlinePaymentDate;
+
+	@ApiModelProperty(value = "备注", required = true)
+	private String memo;
+
+	@ApiModelProperty(value = "批次号", required = false)
+	private String batchNo;
+
+	@ApiModelProperty(value = "会员相关缴费信息", required = false)
+	private CalenderMemberDto calenderMember;
+
+	@ApiModelProperty(value = "乐保信息", required = false)
+	private MusicRepairDto musicRepair;
+
+	@ApiModelProperty(value = "乐团课程信息", required = false)
+	private List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList;
+
+	public MusicRepairDto getMusicRepair() {
+		return musicRepair;
+	}
+
+	public void setMusicRepair(MusicRepairDto musicRepair) {
+		this.musicRepair = musicRepair;
+	}
+
+	public MusicGroup getMusicGroup() {
+		return musicGroup;
+	}
+
+	public void setMusicGroup(MusicGroup musicGroup) {
+		this.musicGroup = musicGroup;
+	}
+
+	public Date getStartPaymentDate() {
+		return startPaymentDate;
+	}
+
+	public void setStartPaymentDate(Date startPaymentDate) {
+		this.startPaymentDate = startPaymentDate;
+	}
+
+	public Date getDeadlinePaymentDate() {
+		return deadlinePaymentDate;
+	}
+
+	public void setDeadlinePaymentDate(Date deadlinePaymentDate) {
+		this.deadlinePaymentDate = deadlinePaymentDate;
+	}
+
+	public CalenderMemberDto getCalenderMember() {
+		return calenderMember;
+	}
+
+	public void setCalenderMember(CalenderMemberDto calenderMember) {
+		this.calenderMember = calenderMember;
+	}
+
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+
+	public Integer getMusicGroupOrganizationCourseSettingId() {
+		return musicGroupOrganizationCourseSettingId;
+	}
+
+	public void setMusicGroupOrganizationCourseSettingId(Integer musicGroupOrganizationCourseSettingId) {
+		this.musicGroupOrganizationCourseSettingId = musicGroupOrganizationCourseSettingId;
+	}
+
+	public PayUserType getPayUserType() {
+		return payUserType;
+	}
+
+	public void setPayUserType(PayUserType payUserType) {
+		this.payUserType = payUserType;
+	}
+
+	public PaymentType getPaymentType() {
+		return paymentType;
+	}
+
+	public void setPaymentType(PaymentType paymentType) {
+		this.paymentType = paymentType;
+	}
+
+	public String getMemo() {
+		return memo;
+	}
+
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
+
+	public List<MusicGroupPaymentCalenderCourseSettings> getMusicGroupPaymentCalenderCourseSettingsList() {
+		return musicGroupPaymentCalenderCourseSettingsList;
+	}
+
+	public void setMusicGroupPaymentCalenderCourseSettingsList(List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList) {
+		this.musicGroupPaymentCalenderCourseSettingsList = musicGroupPaymentCalenderCourseSettingsList;
+	}
+
+	public String getBatchNo() {
+		return batchNo;
+	}
+
+	public void setBatchNo(String batchNo) {
+		this.batchNo = batchNo;
+	}
+}

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

@@ -34,7 +34,7 @@ public class MusicGroupPaymentCalenderDto {
 	private String attribute2;
 
 	private String studentIds;
-	
+
 	private String batchNo;
 
 	private Boolean mergeClassFlag = false;
@@ -43,17 +43,6 @@ public class MusicGroupPaymentCalenderDto {
 
 	private BigDecimal masterTotalPrice = BigDecimal.ZERO;
 
-	//会员缴费相关信息
-	private CalenderMemberDto calenderMember;
-
-	public CalenderMemberDto getCalenderMember() {
-		return calenderMember;
-	}
-
-	public void setCalenderMember(CalenderMemberDto calenderMember) {
-		this.calenderMember = calenderMember;
-	}
-
 	//会员有效期(月)
 	private Integer memberValidDate;
 

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

@@ -0,0 +1,30 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class MusicRepairDto {
+
+    @ApiModelProperty(value = "年限", required = false)
+    private BigDecimal num;
+
+    @ApiModelProperty(value = "团购价", required = false)
+    private BigDecimal actualAmount;
+
+    public BigDecimal getNum() {
+        return num;
+    }
+
+    public void setNum(BigDecimal num) {
+        this.num = num;
+    }
+
+    public BigDecimal getActualAmount() {
+        return actualAmount;
+    }
+
+    public void setActualAmount(BigDecimal actualAmount) {
+        this.actualAmount = actualAmount;
+    }
+}

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

@@ -4,7 +4,9 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
-public class PayParamBasicDto {
+import com.ym.mec.common.entity.BaseEntity;
+
+public class PayParamBasicDto extends BaseEntity {
     @ApiModelProperty(value = "是否使用余额", required = false)
     private Boolean isUseBalancePayment = false;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityApplyStudentType.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(activity_apply_student_type):
  */
-public class ActivityApplyStudentType {
+public class ActivityApplyStudentType extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityPlan.java

@@ -5,10 +5,12 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(activity_plan):
  */
-public class ActivityPlan {
+public class ActivityPlan extends BaseEntity {
 
 	@ApiModelProperty(value = "活动编号")
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityUserMapper.java

@@ -2,12 +2,14 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 import java.math.BigDecimal;
 
 /**
  * 对应数据库表(activity_user_mapper):
  */
-public class ActivityUserMapper {
+public class ActivityUserMapper extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ActivityUserMapperAdjustLog.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(activity_user_mapper_adjust_log):
  */
-public class ActivityUserMapperAdjustLog {
+public class ActivityUserMapperAdjustLog extends BaseEntity {
 
 	/**  1加资格0减资格*/
 	private Integer type;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ChargeTypeOrganizationFee.java

@@ -3,10 +3,12 @@ package com.ym.mec.biz.dal.entity;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(charge_type_organization_fee):
  */
-public class ChargeTypeOrganizationFee {
+public class ChargeTypeOrganizationFee extends BaseEntity {
 	private Integer id;
 
 	private Integer chargeTypeId;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ChargeTypeSubjectMapper.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
+import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 
@@ -11,7 +12,7 @@ import java.math.BigDecimal;
 /**
  * 对应数据库表(charge_type_subject_mapper):
  */
-public class ChargeTypeSubjectMapper {
+public class ChargeTypeSubjectMapper extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ChildrenDayDegreeDetail.java

@@ -2,11 +2,14 @@ package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 @ApiModel(value="com-domain-ChindrenDayDegreeDetail")
-public class ChildrenDayDegreeDetail {
+public class ChildrenDayDegreeDetail extends BaseEntity {
     @ApiModelProperty(value="")
     private Integer id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ChildrenDayDegreeInfo.java

@@ -6,8 +6,10 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 @ApiModel(value = "com-domain-ChildrenDayDegreeInfo")
-public class ChildrenDayDegreeInfo {
+public class ChildrenDayDegreeInfo extends BaseEntity {
     @ApiModelProperty(value = "")
     private Integer id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ChildrenDayReserve.java

@@ -1,13 +1,15 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
 @ApiModel(value = "com-domain-ChildrenDayReserve")
-public class ChildrenDayReserve {
+public class ChildrenDayReserve extends BaseEntity {
     @ApiModelProperty(value = "")
     private Integer id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroup.java

@@ -9,11 +9,12 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.common.entity.BaseEntity;
 
 /**
  * 对应数据库表(class_group):
  */
-public class ClassGroup {
+public class ClassGroup extends BaseEntity {
 
 	/**  */
 	@ApiModelProperty(value = "班级编号", required = false)

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupRelation.java

@@ -1,12 +1,15 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(class_group_relation):
  */
-public class ClassGroupRelation {
+public class ClassGroupRelation extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupStudentMapper.java

@@ -6,13 +6,14 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.common.entity.BaseEntity;
 
 import java.util.Date;
 
 /**
  * 对应数据库表(class_group_student_mapper):
  */
-public class ClassGroupStudentMapper {
+public class ClassGroupStudentMapper extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroupTeacherMapper.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachTypeEnum;
+import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 
@@ -13,7 +14,7 @@ import java.util.List;
 /**
  * 对应数据库表(class_group_teacher_mapper):
  */
-public class ClassGroupTeacherMapper {
+public class ClassGroupTeacherMapper extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CloudTeacher.java

@@ -2,10 +2,13 @@ package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.util.Date;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 @ApiModel(value="com-domain-CloudTeacher")
-public class CloudTeacher {
+public class CloudTeacher extends BaseEntity {
     @ApiModelProperty(value="")
     private Integer id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CloudTeacherOrder.java

@@ -6,8 +6,10 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 @ApiModel(value = "com-domain-CloudTeacherOrder")
-public class CloudTeacherOrder {
+public class CloudTeacherOrder extends BaseEntity {
     @ApiModelProperty(value = "")
     private Long id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CooperationOrgan.java

@@ -7,12 +7,13 @@ import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
 import com.ym.mec.common.enums.BaseEnum;
 
 /**
  * 对应数据库表(cooperation_organ):
  */
-public class CooperationOrgan {
+public class CooperationOrgan extends BaseEntity {
 
 	public enum OwnershipType implements BaseEnum<String, OwnershipType> {
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CooperationOrganLinkman.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(cooperation_organ_linkman):
  */
-public class CooperationOrganLinkman {
+public class CooperationOrganLinkman extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseHomework.java

@@ -1,11 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.common.entity.BaseEntity;
 
 import java.util.Date;
 import java.util.List;
@@ -13,7 +15,7 @@ import java.util.List;
 /**
  * 对应数据库表(course_homework):
  */
-public class CourseHomework {
+public class CourseHomework extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseHomeworkTemplate.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 /**
  * 对应数据库表(course_homework_template):
  */
-public class CourseHomeworkTemplate {
+public class CourseHomeworkTemplate extends BaseEntity {
 
 	/**  */
 	@ApiModelProperty(value = "模板ID",required = false)

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.entity;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.*;
+import com.ym.mec.common.entity.BaseEntity;
 import com.ym.mec.common.enums.BaseEnum;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -22,7 +23,7 @@ import java.util.Objects;
  * 对应数据库表(course_schedule):
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class CourseSchedule {
+public class CourseSchedule  extends BaseEntity{
 
 	private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
 	private SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -188,16 +189,6 @@ public class CourseSchedule {
 	//课程调整不的超过该时间限制
 	private Date validEndTime;
 
-	private Integer tenantId;
-
-	public Integer getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(Integer tenantId) {
-		this.tenantId = tenantId;
-	}
-
 	public Date getValidStartTime() {
 		return validStartTime;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleComplaints.java

@@ -6,11 +6,12 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
+import com.ym.mec.common.entity.BaseEntity;
 
 /**
  * 对应数据库表(course_schedule_complaints):
  */
-public class CourseScheduleComplaints {
+public class CourseScheduleComplaints extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleEvaluate.java

@@ -2,11 +2,13 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
-public class CourseScheduleEvaluate {
+public class CourseScheduleEvaluate extends BaseEntity {
     private Long id;
 
     private String musicGroupId;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleModifyLog.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(course_schedule_modify_log):
  */
-public class CourseScheduleModifyLog {
+public class CourseScheduleModifyLog extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleReview.java

@@ -1,12 +1,15 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
+import com.ym.mec.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
 
-public class CourseScheduleReview {
+public class CourseScheduleReview extends BaseEntity {
     /**
     * 评价id
     */

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleRewardsRules.java

@@ -1,14 +1,17 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
+import com.ym.mec.common.entity.BaseEntity;
 import com.ym.mec.common.enums.BaseEnum;
 
 /**
  * 对应数据库表(course_schedule_rewards_rules):
  */
-public class CourseScheduleRewardsRules {
+public class CourseScheduleRewardsRules extends BaseEntity {
 
 	public enum RewardMode implements BaseEnum<String, RewardMode> {
 		STAIR, PER, TOTAL;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleStudentMusicScore.java

@@ -2,7 +2,9 @@ package com.ym.mec.biz.dal.entity;
 
 import java.util.Date;
 
-public class CourseScheduleStudentMusicScore {
+import com.ym.mec.common.entity.BaseEntity;
+
+public class CourseScheduleStudentMusicScore extends BaseEntity {
     private Integer id;
     private Long courseScheduleId;
     private Integer downStatus = 0;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleStudentPayment.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.entity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 
@@ -11,7 +12,7 @@ import java.math.BigDecimal;
 /**
  * 对应数据库表(course_schedule_student_payment):
  */
-public class CourseScheduleStudentPayment implements Comparable<CourseScheduleStudentPayment> {
+public class CourseScheduleStudentPayment extends BaseEntity implements Comparable<CourseScheduleStudentPayment> {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleTeacherSalary.java

@@ -4,7 +4,10 @@ import com.ym.mec.biz.dal.dto.TeacherSalaryDeductReasonDto;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import com.ym.mec.biz.dal.enums.TeacherSalaryConfirmStatus;
+import com.ym.mec.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
@@ -13,7 +16,7 @@ import java.util.List;
 /**
  * 对应数据库表(course_schedule_teacher_salary):
  */
-public class CourseScheduleTeacherSalary {
+public class CourseScheduleTeacherSalary extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CoursesGroup.java

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.GroupStatusEnum;
+import com.ym.mec.common.entity.BaseEntity;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
@@ -8,7 +10,7 @@ import java.math.BigDecimal;
 /**
  * 对应数据库表(courses_group):
  */
-public class CoursesGroup{
+public class CoursesGroup extends BaseEntity{
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CoursesGroupModifyLog.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import java.util.Date;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(courses_group_modify_log):
  */
-public class CoursesGroupModifyLog{
+public class CoursesGroupModifyLog extends BaseEntity{
 
 	private Long id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DataChangeLog.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(data_change_log):
  */
-public class DataChangeLog {
+public class DataChangeLog extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeLevelFee.java

@@ -2,11 +2,14 @@ package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 @ApiModel(value="com-domain-DegreeLevelFee")
-public class DegreeLevelFee {
+public class DegreeLevelFee extends BaseEntity {
     @ApiModelProperty(value="")
     private Integer id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeRegistration.java

@@ -5,7 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class DegreeRegistration {
+import com.ym.mec.common.entity.BaseEntity;
+
+public class DegreeRegistration extends BaseEntity {
     private Integer id;
 
     /**

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DemoGroup.java

@@ -1,14 +1,17 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 import java.math.BigDecimal;
 
 /**
  * 对应数据库表(demo_group):
  */
-public class DemoGroup {
+public class DemoGroup extends BaseEntity {
 
 	/**  */
 	@ApiModelProperty(value = "试听课编号",required = false)
@@ -42,16 +45,6 @@ public class DemoGroup {
 	@ApiModelProperty(value = "科目名称")
 	private String subjectName;
 
-	private Integer tenantId;
-
-	public Integer getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(Integer tenantId) {
-		this.tenantId = tenantId;
-	}
-
 	public String getSubjectName() {
 		return subjectName;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DemoGroupClassGroupMapper.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(demo_group_class_group_mapper):
  */
-public class DemoGroupClassGroupMapper {
+public class DemoGroupClassGroupMapper extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DemoGroupCoursesPlan.java

@@ -1,8 +1,11 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.common.entity.BaseEntity;
 import com.ym.mec.util.date.DateUtil;
+
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
@@ -10,7 +13,7 @@ import java.util.Date;
 /**
  * 对应数据库表(demo_group_courses_plan):
  */
-public class DemoGroupCoursesPlan {
+public class DemoGroupCoursesPlan extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/EmployeeInfo.java

@@ -7,11 +7,12 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.ym.mec.biz.dal.enums.JobNatureEnum;
 import com.ym.mec.biz.dal.enums.JobTypeEnum;
 import com.ym.mec.biz.dal.enums.StaffStatusEnum;
+import com.ym.mec.common.entity.BaseEntity;
 
 /**
  * 对应数据库表(employee_info):
  */
-public class EmployeeInfo {
+public class EmployeeInfo extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/EmployeeVisit.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(employee_visit):
  */
-public class EmployeeVisit {
+public class EmployeeVisit extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercises.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
+import com.ym.mec.common.entity.BaseEntity;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.auth.api.entity.SysUser;
@@ -11,7 +13,7 @@ import java.util.List;
 /**
  * 对应数据库表(extracurricular_exercises):
  */
-public class ExtracurricularExercises {
+public class ExtracurricularExercises extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercisesMessage.java

@@ -1,12 +1,14 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
+import com.ym.mec.common.entity.BaseEntity;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * 对应数据库表(extracurricular_exercises_message):
  */
-public class ExtracurricularExercisesMessage {
+public class ExtracurricularExercisesMessage extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercisesReply.java

@@ -3,13 +3,14 @@ package com.ym.mec.biz.dal.entity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.common.entity.BaseEntity;
 
 import java.util.Date;
 
 /**
  * 对应数据库表(extracurricular_exercises_reply):
  */
-public class ExtracurricularExercisesReply {
+public class ExtracurricularExercisesReply extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/FinancialExpenditure.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ExpenditureTypeEnum;
 import com.ym.mec.biz.dal.enums.FeeProjectEnum;
+import com.ym.mec.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -12,7 +14,7 @@ import static com.ym.mec.biz.dal.enums.ExpenditureTypeEnum.REFUND;
 /**
  * 对应数据库表(financial_expenditure):
  */
-public class FinancialExpenditure {
+public class FinancialExpenditure extends BaseEntity {
 
 	private Integer id;
 	/**  */

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Goods.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.biz.dal.enums.GoodsType;
 import com.ym.mec.biz.dal.enums.StockType;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 
@@ -14,7 +15,7 @@ import java.util.List;
 /**
  * 对应数据库表(goods):
  */
-public class Goods {
+public class Goods extends BaseEntity {
 
 	/** 商品编号 */
 	@ApiModelProperty(value = "商品编号",required = false)

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/GoodsCategory.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 
@@ -11,7 +12,7 @@ import java.util.List;
 /**
  * 对应数据库表(goods_category):
  */
-public class GoodsCategory {
+public class GoodsCategory extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/GoodsOrder.java

@@ -1,7 +1,10 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.common.entity.BaseEntity;
 import com.ym.mec.common.enums.BaseEnum;
+
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
@@ -9,7 +12,7 @@ import java.math.BigDecimal;
 /**
  * 对应数据库表(goods_order):
  */
-public class GoodsOrder {
+public class GoodsOrder extends BaseEntity {
 
 	public enum OrderStatus implements BaseEnum<String, OrderStatus> {
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/GoodsOrderItem.java

@@ -1,14 +1,17 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 import java.math.BigDecimal;
 
 /**
  * 对应数据库表(goods_order_item):
  */
-public class GoodsOrderItem {
+public class GoodsOrderItem extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/GoodsOrderPayment.java

@@ -1,8 +1,10 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
 import com.ym.mec.common.enums.BaseEnum;
 
 import java.math.BigDecimal;
@@ -10,7 +12,7 @@ import java.math.BigDecimal;
 /**
  * 对应数据库表(goods_order_payment):
  */
-public class GoodsOrderPayment {
+public class GoodsOrderPayment extends BaseEntity {
 
 	public enum PayStatus implements BaseEnum<String, PayStatus> {
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/GoodsProcurement.java

@@ -1,12 +1,15 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(goods_procurement):
  */
-public class GoodsProcurement {
+public class GoodsProcurement extends BaseEntity {
 
 	@ApiModelProperty(value = "编号")
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/HfMember.java

@@ -1,12 +1,15 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.springframework.web.multipart.MultipartFile;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class HfMember {
+public class HfMember extends BaseEntity {
     @ApiModelProperty(value = "id",required = true)
     private Integer Id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/HotWordsLabel.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(hot_words_label):
  */
-public class HotWordsLabel {
+public class HotWordsLabel extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroup.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(im_group):
  */
-public class ImGroup {
+public class ImGroup extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupMember.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(im_group_member):
  */
-public class ImGroupMember {
+public class ImGroupMember extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupNotice.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(im_group_notice):
  */
-public class ImGroupNotice {
+public class ImGroupNotice extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImUserFriend.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(im_user_friend):
  */
-public class ImUserFriend {
+public class ImUserFriend extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/IndexBaseMonthData.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.IndexDataType;
+import com.ym.mec.common.entity.BaseEntity;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -8,7 +9,7 @@ import java.util.Date;
 /**
  * 对应数据库表(index_base_month_data):
  */
-public class IndexBaseMonthData {
+public class IndexBaseMonthData extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/IndexErrDataRecord.java

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.IndexErrorType;
+import com.ym.mec.common.entity.BaseEntity;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
@@ -8,7 +10,7 @@ import java.util.Date;
 /**
  * 对应数据库表(index_err_data_record):
  */
-public class IndexErrDataRecord {
+public class IndexErrDataRecord extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Inspection.java

@@ -7,11 +7,14 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.PastOrPresent;
 import javax.validation.constraints.Positive;
+
+import com.ym.mec.common.entity.BaseEntity;
+
 import java.util.Date;
 import java.util.List;
 
 @ApiModel(value = "com-ym-mec-biz-dal-entity-Inspection")
-public class Inspection {
+public class Inspection extends BaseEntity {
     /**
      * id
      */

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItem.java

@@ -1,12 +1,15 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.InspectionItemEnum;
+import com.ym.mec.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.util.Date;
 
 @ApiModel(value = "com-ym-mec-biz-dal-entity-InspectionItem")
-public class InspectionItem {
+public class InspectionItem extends BaseEntity {
     /**
      * 巡查任务项id
      */

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlan.java

@@ -4,10 +4,13 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Positive;
+
+import com.ym.mec.common.entity.BaseEntity;
+
 import java.util.Date;
 
 @ApiModel(value = "com-ym-mec-biz-dal-entity-InspectionItemPlan")
-public class InspectionItemPlan {
+public class InspectionItemPlan extends BaseEntity {
     /**
      * 计划id
      */

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlanConclusion.java

@@ -2,10 +2,13 @@ package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.util.Date;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 @ApiModel(value = "com-ym-mec-biz-dal-entity-InspectionItemPlanConclusion")
-public class InspectionItemPlanConclusion {
+public class InspectionItemPlanConclusion extends BaseEntity {
     @ApiModelProperty(value = "")
     private Long id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/LeaveCategory.java

@@ -1,11 +1,11 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
-
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+
 /**
  * 对应数据库表(leave_category):
  */

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/LuckDrawCount.java

@@ -3,7 +3,9 @@ package com.ym.mec.biz.dal.entity;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class LuckDrawCount {
+import com.ym.mec.common.entity.BaseEntity;
+
+public class LuckDrawCount extends BaseEntity {
 	private Long userId;
 
 	private Integer usedCount;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/LuckDrawGroup.java

@@ -2,7 +2,9 @@ package com.ym.mec.biz.dal.entity;
 
 import java.util.Date;
 
-public class LuckDrawGroup {
+import com.ym.mec.common.entity.BaseEntity;
+
+public class LuckDrawGroup extends BaseEntity {
     private Integer id;
 
     private String name;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/LuckDrawLog.java

@@ -3,8 +3,9 @@ package com.ym.mec.biz.dal.entity;
 import java.util.Date;
 
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.common.entity.BaseEntity;
 
-public class LuckDrawLog {
+public class LuckDrawLog extends BaseEntity {
 	private Long id;
 
 	private Integer prizeId;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/LuckDrawPrize.java

@@ -4,9 +4,10 @@ import java.util.Date;
 
 import org.apache.commons.lang3.StringUtils;
 
+import com.ym.mec.common.entity.BaseEntity;
 import com.ym.mec.common.enums.BaseEnum;
 
-public class LuckDrawPrize {
+public class LuckDrawPrize extends BaseEntity {
 
 	public enum ActiveRewardType implements BaseEnum<String, ActiveRewardType> {
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ManagerDownload.java

@@ -1,12 +1,15 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ExportTypeEnum;
+import com.ym.mec.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.util.Date;
 
 @ApiModel(value = "com-ym-mec-biz-dal-entity-ManagerDownload")
-public class ManagerDownload {
+public class ManagerDownload extends BaseEntity {
     @ApiModelProperty(value = "")
     private Integer id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ManagerDownloadExample.java

@@ -1,641 +0,0 @@
-package com.ym.mec.biz.dal.entity;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class ManagerDownloadExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public ManagerDownloadExample() {
-        oredCriteria = new ArrayList<>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andIdIsNull() {
-            addCriterion("id_ is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIsNotNull() {
-            addCriterion("id_ is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdEqualTo(Integer value) {
-            addCriterion("id_ =", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotEqualTo(Integer value) {
-            addCriterion("id_ <>", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThan(Integer value) {
-            addCriterion("id_ >", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("id_ >=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThan(Integer value) {
-            addCriterion("id_ <", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
-            addCriterion("id_ <=", value, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdIn(List<Integer> values) {
-            addCriterion("id_ in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<Integer> values) {
-            addCriterion("id_ not in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdBetween(Integer value1, Integer value2) {
-            addCriterion("id_ between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("id_ not between", value1, value2, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdIsNull() {
-            addCriterion("user_id_ is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdIsNotNull() {
-            addCriterion("user_id_ is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdEqualTo(Integer value) {
-            addCriterion("user_id_ =", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdNotEqualTo(Integer value) {
-            addCriterion("user_id_ <>", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdGreaterThan(Integer value) {
-            addCriterion("user_id_ >", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("user_id_ >=", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdLessThan(Integer value) {
-            addCriterion("user_id_ <", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdLessThanOrEqualTo(Integer value) {
-            addCriterion("user_id_ <=", value, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdIn(List<Integer> values) {
-            addCriterion("user_id_ in", values, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdNotIn(List<Integer> values) {
-            addCriterion("user_id_ not in", values, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdBetween(Integer value1, Integer value2) {
-            addCriterion("user_id_ between", value1, value2, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("user_id_ not between", value1, value2, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIsNull() {
-            addCriterion("name_ is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIsNotNull() {
-            addCriterion("name_ is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameEqualTo(String value) {
-            addCriterion("name_ =", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotEqualTo(String value) {
-            addCriterion("name_ <>", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameGreaterThan(String value) {
-            addCriterion("name_ >", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameGreaterThanOrEqualTo(String value) {
-            addCriterion("name_ >=", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLessThan(String value) {
-            addCriterion("name_ <", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLessThanOrEqualTo(String value) {
-            addCriterion("name_ <=", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameLike(String value) {
-            addCriterion("name_ like", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotLike(String value) {
-            addCriterion("name_ not like", value, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameIn(List<String> values) {
-            addCriterion("name_ in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotIn(List<String> values) {
-            addCriterion("name_ not in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameBetween(String value1, String value2) {
-            addCriterion("name_ between", value1, value2, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotBetween(String value1, String value2) {
-            addCriterion("name_ not between", value1, value2, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlIsNull() {
-            addCriterion("file_url_ is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlIsNotNull() {
-            addCriterion("file_url_ is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlEqualTo(String value) {
-            addCriterion("file_url_ =", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlNotEqualTo(String value) {
-            addCriterion("file_url_ <>", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlGreaterThan(String value) {
-            addCriterion("file_url_ >", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("file_url_ >=", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlLessThan(String value) {
-            addCriterion("file_url_ <", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlLessThanOrEqualTo(String value) {
-            addCriterion("file_url_ <=", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlLike(String value) {
-            addCriterion("file_url_ like", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlNotLike(String value) {
-            addCriterion("file_url_ not like", value, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlIn(List<String> values) {
-            addCriterion("file_url_ in", values, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlNotIn(List<String> values) {
-            addCriterion("file_url_ not in", values, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlBetween(String value1, String value2) {
-            addCriterion("file_url_ between", value1, value2, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileUrlNotBetween(String value1, String value2) {
-            addCriterion("file_url_ not between", value1, value2, "fileUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIsNull() {
-            addCriterion("status_ is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIsNotNull() {
-            addCriterion("status_ is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusEqualTo(Integer value) {
-            addCriterion("status_ =", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotEqualTo(Integer value) {
-            addCriterion("status_ <>", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusGreaterThan(Integer value) {
-            addCriterion("status_ >", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
-            addCriterion("status_ >=", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusLessThan(Integer value) {
-            addCriterion("status_ <", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusLessThanOrEqualTo(Integer value) {
-            addCriterion("status_ <=", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIn(List<Integer> values) {
-            addCriterion("status_ in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotIn(List<Integer> values) {
-            addCriterion("status_ not in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusBetween(Integer value1, Integer value2) {
-            addCriterion("status_ between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
-            addCriterion("status_ not between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNull() {
-            addCriterion("create_time_ is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNotNull() {
-            addCriterion("create_time_ is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeEqualTo(Date value) {
-            addCriterion("create_time_ =", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotEqualTo(Date value) {
-            addCriterion("create_time_ <>", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThan(Date value) {
-            addCriterion("create_time_ >", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("create_time_ >=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThan(Date value) {
-            addCriterion("create_time_ <", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("create_time_ <=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<Date> values) {
-            addCriterion("create_time_ in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Date> values) {
-            addCriterion("create_time_ not in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeBetween(Date value1, Date value2) {
-            addCriterion("create_time_ between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("create_time_ not between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNull() {
-            addCriterion("update_time_ is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNotNull() {
-            addCriterion("update_time_ is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeEqualTo(Date value) {
-            addCriterion("update_time_ =", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotEqualTo(Date value) {
-            addCriterion("update_time_ <>", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThan(Date value) {
-            addCriterion("update_time_ >", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("update_time_ >=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThan(Date value) {
-            addCriterion("update_time_ <", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("update_time_ <=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIn(List<Date> values) {
-            addCriterion("update_time_ in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<Date> values) {
-            addCriterion("update_time_ not in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
-            addCriterion("update_time_ between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("update_time_ not between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MarketActivity.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import java.util.Date;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(market_activity):
  */
-public class MarketActivity {
+public class MarketActivity extends BaseEntity {
 
 	private Integer id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MemberFeeSetting.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(member_fee_setting):
  */
-public class MemberFeeSetting {
+public class MemberFeeSetting extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MemberRankOrganizationFeeMapper.java

@@ -2,10 +2,12 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(member_rank_organization_fee_mapper):
  */
-public class MemberRankOrganizationFeeMapper {
+public class MemberRankOrganizationFeeMapper extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicEnlightenmentQuestionnaire.java

@@ -1,14 +1,17 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 import java.util.Date;
 
 /**
  * 对应数据库表(music_enlightenment_questionnaire):
  */
-public class MusicEnlightenmentQuestionnaire {
+public class MusicEnlightenmentQuestionnaire extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -11,11 +12,12 @@ import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.common.entity.BaseEntity;
 
 /**
  * 对应数据库表(music_group):
  */
-public class MusicGroup {
+public class MusicGroup extends BaseEntity {
 
 	/**  */
 	private String id;
@@ -197,14 +199,6 @@ public class MusicGroup {
 
 	private Integer tenantId;
 
-	public Integer getTenantId() {
-		return tenantId;
-	}
-
-	public void setTenantId(Integer tenantId) {
-		this.tenantId = tenantId;
-	}
-
 	public Integer getHasInstrumentNum() {
 		return hasInstrumentNum;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupBuildLog.java

@@ -1,12 +1,15 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(music_group_build_log):
  */
-public class MusicGroupBuildLog {
+public class MusicGroupBuildLog extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupNews.java

@@ -1,12 +1,14 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.common.entity.BaseEntity;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * 对应数据库表(music_group_news):
  */
-public class MusicGroupNews {
+public class MusicGroupNews extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupOrganizationCourseSettings.java

@@ -1,11 +1,14 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-public class MusicGroupOrganizationCourseSettings {
+import com.ym.mec.common.entity.BaseEntity;
+
+public class MusicGroupOrganizationCourseSettings extends BaseEntity {
     @ApiModelProperty(value="")
     private Integer id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupOrganizationCourseSettingsDetail.java

@@ -5,7 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class MusicGroupOrganizationCourseSettingsDetail {
+import com.ym.mec.common.entity.BaseEntity;
+
+public class MusicGroupOrganizationCourseSettingsDetail extends BaseEntity {
     @ApiModelProperty(value="")
     private Integer id;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalender.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
+import com.ym.mec.biz.dal.enums.PeriodEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -10,12 +11,15 @@ import java.util.List;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.entity.BaseEntity;
 import com.ym.mec.common.enums.BaseEnum;
 
+import static com.ym.mec.biz.dal.enums.PeriodEnum.MONTH;
+
 /**
  * 对应数据库表(music_group_payment_calender):
  */
-public class MusicGroupPaymentCalender {
+public class MusicGroupPaymentCalender extends BaseEntity {
 
 	public Integer getChargeTypeId() {
 		return chargeTypeId;
@@ -140,7 +144,7 @@ public class MusicGroupPaymentCalender {
 	@ApiModelProperty(value = "审核意见", required = false)
 	private String auditMemo;
 
-	private Boolean isGiveMusicNetwork;
+	private Boolean isGiveMusicNetwork = false;
 	
 	private String rejectReason;
 
@@ -166,6 +170,9 @@ public class MusicGroupPaymentCalender {
 	@ApiModelProperty(value = "课程展现形式",required = false)
 	private CourseViewTypeEnum courseViewType;
 
+	//会员周期
+	private PeriodEnum memberPeriod = MONTH;
+
 	//会员有效期(月)
 	private Integer memberValidDate;
 
@@ -181,6 +188,14 @@ public class MusicGroupPaymentCalender {
 	//会员等级名称
 	private String memberRankSettingName;
 
+	public PeriodEnum getMemberPeriod() {
+		return memberPeriod;
+	}
+
+	public void setMemberPeriod(PeriodEnum memberPeriod) {
+		this.memberPeriod = memberPeriod;
+	}
+
 	public String getMemberRankSettingName() {
 		return memberRankSettingName;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderCourseSettings.java

@@ -1,12 +1,14 @@
 package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType;
+import com.ym.mec.common.entity.BaseEntity;
 
 /**
  * 对应数据库表(music_group_payment_calender_course_settings):
  */
-public class MusicGroupPaymentCalenderCourseSettings {
+public class MusicGroupPaymentCalenderCourseSettings extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderDetail.java

@@ -2,10 +2,13 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
+import com.ym.mec.common.entity.BaseEntity;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -13,7 +16,7 @@ import java.util.Date;
 /**
  * 对应数据库表(music_group_payment_calender_detail):
  */
-public class MusicGroupPaymentCalenderDetail {
+public class MusicGroupPaymentCalenderDetail extends BaseEntity {
 
 	/**  */
 	private Long id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderStudentDetail.java

@@ -3,10 +3,12 @@ package com.ym.mec.biz.dal.entity;
 import java.math.BigDecimal;
 import java.util.Objects;
 
+import com.ym.mec.common.entity.BaseEntity;
+
 /**
  * 对应数据库表(music_group_payment_calender_student_detail):
  */
-public class MusicGroupPaymentCalenderStudentDetail {
+public class MusicGroupPaymentCalenderStudentDetail extends BaseEntity {
 
 	/**  */
 	private Integer id;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentEntities.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.PaymentMethod;
+import com.ym.mec.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 
@@ -11,7 +12,7 @@ import java.math.BigDecimal;
 /**
  * 对应数据库表(music_group_payment_entities):
  */
-public class MusicGroupPaymentEntities {
+public class MusicGroupPaymentEntities extends BaseEntity {
 
 	/**  */
 	private Integer id;