Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

# Conflicts:
#	cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SubjectController.java

cooleshow-payment/payment-api/src/main/java/com/yonge/cooleshow/payment/dto/OrderPayDto.java

@@ -1,12 +1,9 @@
 package com.yonge.cooleshow.payment.dto;
 
-import lombok.Data;
-
 /**
  * @Author: liweifan
  * @Data: 2022/3/11 18:45
  */
-@Data
 public class OrderPayDto {
     /***
      * 订单对象
@@ -15,4 +12,11 @@ public class OrderPayDto {
      */
     private OrderDto orderDto;
 
+    public OrderDto getOrderDto() {
+        return orderDto;
+    }
+
+    public void setOrderDto(OrderDto orderDto) {
+        this.orderDto = orderDto;
+    }
 }

cooleshow-payment/payment-api/src/main/java/com/yonge/cooleshow/payment/sdk/PaymentConfirmParam.java

@@ -1,14 +1,11 @@
 package com.yonge.cooleshow.payment.sdk;
 
-import lombok.Data;
-
 import java.util.List;
 
 /**
  * @Author: liweifan
  * @Data: 2022/3/11 17:44
  */
-@Data
 public class PaymentConfirmParam {
     //Adapay生成的支付对象id
     private String payment_id;
@@ -23,12 +20,59 @@ public class PaymentConfirmParam {
     //手续费收取模式：O-商户手续费账户扣取手续费，I-交易金额中扣取手续费；值为空时，默认值为I；若为O时，分账对象列表中不支持传入手续费承担方
     private String fee_mode;
 
+    public String getPayment_id() {
+        return payment_id;
+    }
+
+    public void setPayment_id(String payment_id) {
+        this.payment_id = payment_id;
+    }
+
+    public String getOrder_no() {
+        return order_no;
+    }
+
+    public void setOrder_no(String order_no) {
+        this.order_no = order_no;
+    }
+
+    public String getConfirm_amt() {
+        return confirm_amt;
+    }
+
+    public void setConfirm_amt(String confirm_amt) {
+        this.confirm_amt = confirm_amt;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List<DivMember> getDiv_members() {
+        return div_members;
+    }
+
+    public void setDiv_members(List<DivMember> div_members) {
+        this.div_members = div_members;
+    }
+
+    public String getFee_mode() {
+        return fee_mode;
+    }
+
+    public void setFee_mode(String fee_mode) {
+        this.fee_mode = fee_mode;
+    }
+
     /***
      * 分账对象
      * @author liweifan
      * @updateTime 2022/3/11 18:03
      */
-    @Data
     public class  DivMember{
         //分账用户 Member对象 的 id；若是商户本身时，传入0
         private String member_id;
@@ -36,5 +80,29 @@ public class PaymentConfirmParam {
         private String amount;
         //是否手续费承担方，N-否，Y-是，手续费承担方有且只能有一个
         private String fee_flag;
+
+        public String getMember_id() {
+            return member_id;
+        }
+
+        public void setMember_id(String member_id) {
+            this.member_id = member_id;
+        }
+
+        public String getAmount() {
+            return amount;
+        }
+
+        public void setAmount(String amount) {
+            this.amount = amount;
+        }
+
+        public String getFee_flag() {
+            return fee_flag;
+        }
+
+        public void setFee_flag(String fee_flag) {
+            this.fee_flag = fee_flag;
+        }
     }
 }

cooleshow-payment/payment-server/src/main/java/com/yonge/cooleshow/payment/config/HuifuConfiguration.java

@@ -3,8 +3,6 @@ package com.yonge.cooleshow.payment.config;
 import com.huifu.adapay.Adapay;
 import com.huifu.adapay.model.MerConfig;
 import com.yonge.cooleshow.payment.props.HuifuProperties;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,9 +19,7 @@ import org.springframework.web.server.WebFilterChain;
 /**
  * 路由配置信息
  */
-@Slf4j
 @Configuration
-@AllArgsConstructor
 @EnableConfigurationProperties({HuifuProperties.class})
 public class HuifuConfiguration {
 	private static HuifuProperties huifuProperties;

cooleshow-payment/payment-server/src/main/java/com/yonge/cooleshow/payment/controller/PaymentController.java

@@ -4,8 +4,6 @@ import com.huifu.adapay.core.AdapayCore;
 import com.huifu.adapay.core.util.AdapaySign;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,10 +16,8 @@ import javax.servlet.http.HttpServletRequest;
  * @Data: 2022/3/11 18:16
  */
 @RestController
-@AllArgsConstructor
 @RequestMapping("/payment")
 @Api(value = "付款接口", tags = "付款接口")
-@Slf4j
 public class PaymentController {
 
     @PostMapping("/orderPay")
@@ -47,7 +43,6 @@ public class PaymentController {
             boolean checkSign;
             //验签传参publicKey
             String publicKey = AdapayCore.PUBLIC_KEY;
-            log.info("验签传参：data={}sign={}");
             //验签
             checkSign = AdapaySign.verifySign(data, sign, publicKey);
             if(checkSign){
@@ -57,7 +52,6 @@ public class PaymentController {
                 //验签失败逻辑
             }
         }catch (Exception e){
-            log.info("异步回调开始，参数，request={}");
         }
         return ;
     }

cooleshow-payment/payment-server/src/main/java/com/yonge/cooleshow/payment/props/HuifuProperties.java

@@ -1,13 +1,11 @@
 package com.yonge.cooleshow.payment.props;
 
-import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 
 /**
  * 权限过滤
  */
-@Data
 @RefreshScope
 @ConfigurationProperties("huifu")
 public class HuifuProperties {
@@ -18,4 +16,36 @@ public class HuifuProperties {
     private String rsaPrivateKey;
 
     private String appId;
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    public String getMockApiKey() {
+        return mockApiKey;
+    }
+
+    public void setMockApiKey(String mockApiKey) {
+        this.mockApiKey = mockApiKey;
+    }
+
+    public String getRsaPrivateKey() {
+        return rsaPrivateKey;
+    }
+
+    public void setRsaPrivateKey(String rsaPrivateKey) {
+        this.rsaPrivateKey = rsaPrivateKey;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
 }

cooleshow-payment/payment-server/src/main/java/com/yonge/cooleshow/payment/sdk/PaymentSdk.java

@@ -5,14 +5,12 @@ import com.huifu.adapay.model.Payment;
 import com.huifu.adapay.model.PaymentConfirm;
 import com.yonge.cooleshow.payment.config.HuifuConfiguration;
 import com.yonge.cooleshow.payment.exception.ThirdpartyException;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
 import java.util.Map;
 
 @Component
-@Slf4j
 public class PaymentSdk {
 
     /**
@@ -24,10 +22,10 @@ public class PaymentSdk {
     public Map<String, Object> executePayment(Map<String, Object> paymentParams) throws Exception {
         paymentParams.put("app_id", HuifuConfiguration.getHuifuProperties().getAppId());
 
-        log.info("汇付[创建支付对象] Req：{}", paymentParams);
+        //log.info("汇付[创建支付对象] Req：{}", paymentParams);
         //调用sdk方法，创建支付，得到支付对象
         Map<String, Object> payment = Payment.create(paymentParams);
-        log.info("汇付[创建支付对象] Resp：{}", payment);
+        //log.info("汇付[创建支付对象] Resp：{}", payment);
 
         String errorCode = (String) payment.get("error_code");
         if (null != errorCode) {

cooleshow-payment/pom.xml

@@ -20,14 +20,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
-        </dependency>
-    </dependencies>
-
     <modules>
         <module>payment-server</module>
         <module>payment-api</module>

cooleshow-user/user-biz/pom.xml

@@ -27,12 +27,6 @@
             <artifactId>swagger-spring-boot-starter</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
-        </dependency>
-
         <!-- mybatis-plus -->
         <dependency>
             <groupId>com.baomidou</groupId>

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherAuthEntryRecordDao.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherAuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import io.swagger.models.auth.In;
@@ -15,7 +16,7 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	/**
 	 * 自定义分页
 	 */
-	List<TeacherAuthEntryRecordVo> selectPage(IPage page, TeacherAuthEntryRecord teacherAuthEntryRecord);
+	List<TeacherAuthEntryRecordVo> selectPage(IPage page,@Param("param") TeacherAuthEntryRecordSearch search);
 
 	/***
 	 * 修改用户实名信息

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/AuthOperaDto.java

@@ -2,7 +2,8 @@ package com.yonge.cooleshow.biz.dal.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
 
 /**
  * 审核操作对象
@@ -10,13 +11,39 @@ import lombok.Data;
  * @Author: liweifan
  * @Data: 2022/3/18 15:04
  */
-@Data
 @ApiModel(value = "AuthOperaDto", description = "审核操作对象")
 public class AuthOperaDto {
+    @NotBlank(message = "审核单id不能为空")
     @ApiModelProperty(value = "审核单id", required = true)
     private Long id;
+    @NotBlank(message = "请说明审核是否通过")
     @ApiModelProperty(value = "审核是否通过", required = true)
     private Boolean isPass;
+    @NotBlank(message = "请说明审核理由")
     @ApiModelProperty(value = "审核理由", required = true)
     private String reason;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Boolean getPass() {
+        return isPass;
+    }
+
+    public void setPass(Boolean pass) {
+        isPass = pass;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/RealnameAuthDto.java

@@ -1,21 +1,40 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
 
 /**
  * 实名认证请求对象
+ *
  * @Author: liweifan
  * @Data: 2022/3/18 15:04
  */
-@Data
 @ApiModel(value = "RealnameAuthDto对象", description = "实名认证请求对象")
 public class RealnameAuthDto {
 
-    @ApiModelProperty("用户真实姓名")
+    @NotBlank(message = "用户真实姓名不能为空")
+    @ApiModelProperty(value = "用户真实姓名", required = true)
     private String realname;
-    @ApiModelProperty("用户身份证号")
+
+    @NotBlank(message = "用户身份证号不能为空")
+    @ApiModelProperty(value = "用户身份证号", required = true)
     private String idcardNo;
+
+    public String getRealname() {
+        return realname;
+    }
+
+    public void setRealname(String realname) {
+        this.realname = realname;
+    }
+
+    public String getIdcardNo() {
+        return idcardNo;
+    }
+
+    public void setIdcardNo(String idcardNo) {
+        this.idcardNo = idcardNo;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/TeacherApplyDetailDto.java

@@ -3,9 +3,9 @@ package com.yonge.cooleshow.biz.dal.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -13,19 +13,21 @@ import java.util.Date;
  * @Author: liweifan
  * @Data: 2022/3/18 14:56
  */
-@Data
 @ApiModel(value = "TeacherApplyDetailDto对象", description = "老师入驻申请信息")
 public class TeacherApplyDetailDto implements Serializable {
 
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
+    @NotBlank(message = "用户真实姓名不能为空")
     @ApiModelProperty(value = "真实姓名", required = true)
     private String realName;
 
+    @NotBlank(message = "身份证号不能为空")
     @ApiModelProperty(value = "身份证号", required = true)
     private String idCardNo;
 
+    @NotBlank(message = "性别不能为空")
     @ApiModelProperty(value = "性别（0，女  1，男）", required = true)
     private String gender;
 
@@ -34,9 +36,11 @@ public class TeacherApplyDetailDto implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date birthdate;
 
+    @NotBlank(message = "专业技能不能为空")
     @ApiModelProperty(value = "专业技能（支持多个，用逗号分隔），对应乐器表id ", required = true)
     private String subjectId;
 
+    @NotBlank(message = "个人介绍不能为空")
     @ApiModelProperty(value = "个人介绍 ", required = true)
     private String introduction;
 
@@ -54,4 +58,100 @@ public class TeacherApplyDetailDto implements Serializable {
 
     @ApiModelProperty("教师资格证 ")
     private String teacherCertificate;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getIdCardNo() {
+        return idCardNo;
+    }
+
+    public void setIdCardNo(String idCardNo) {
+        this.idCardNo = idCardNo;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public Date getBirthdate() {
+        return birthdate;
+    }
+
+    public void setBirthdate(Date birthdate) {
+        this.birthdate = birthdate;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
+    public String getGraduateSchool() {
+        return graduateSchool;
+    }
+
+    public void setGraduateSchool(String graduateSchool) {
+        this.graduateSchool = graduateSchool;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getGradCertificate() {
+        return gradCertificate;
+    }
+
+    public void setGradCertificate(String gradCertificate) {
+        this.gradCertificate = gradCertificate;
+    }
+
+    public String getDegreeCertificate() {
+        return degreeCertificate;
+    }
+
+    public void setDegreeCertificate(String degreeCertificate) {
+        this.degreeCertificate = degreeCertificate;
+    }
+
+    public String getTeacherCertificate() {
+        return teacherCertificate;
+    }
+
+    public void setTeacherCertificate(String teacherCertificate) {
+        this.teacherCertificate = teacherCertificate;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherAuthEntryRecordSearch.java

@@ -1,16 +1,70 @@
 package com.yonge.cooleshow.biz.dal.dto.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * @Author: liweifan
  * @Data: 2022/3/21 15:26
  */
-@Data
 @ApiModel(value = "TeacherAuthEntryRecordSearch", description = "老师入驻审核列表查询")
 public class TeacherAuthEntryRecordSearch {
-    @ApiModelProperty(value = "老师编号/名称/电话", required = true)
+    @ApiModelProperty(value = "老师编号/名称/电话")
     private String search;
+    @ApiModelProperty(value = "审批人")
+    private String verifyUser;
+    @ApiModelProperty(value = "申请开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
+    @ApiModelProperty(value = "申请结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
+    @ApiModelProperty(value = "老师认证审核状态  1、审核中 2、通过 3、不通过")
+    private Integer teacherAuthStatus;
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    public String getVerifyUser() {
+        return verifyUser;
+    }
+
+    public void setVerifyUser(String verifyUser) {
+        this.verifyUser = verifyUser;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getTeacherAuthStatus() {
+        return teacherAuthStatus;
+    }
+
+    public void setTeacherAuthStatus(Integer teacherAuthStatus) {
+        this.teacherAuthStatus = teacherAuthStatus;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/AlbumFavorite.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 专辑收藏表
  */
-@Data
 @TableName("album_favorite")
 @ApiModel(value = "AlbumFavorite对象", description = "专辑收藏表")
 public class AlbumFavorite implements Serializable {
@@ -51,6 +49,46 @@ public class AlbumFavorite implements Serializable {
 	@TableField(value = "favorite_flag_")
     private Byte favoriteFlag;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getAlbumId() {
+        return albumId;
+    }
+
+    public void setAlbumId(Long albumId) {
+        this.albumId = albumId;
+    }
+
+    public Date getFavoriteTime() {
+        return favoriteTime;
+    }
+
+    public void setFavoriteTime(Date favoriteTime) {
+        this.favoriteTime = favoriteTime;
+    }
+
+    public Byte getFavoriteFlag() {
+        return favoriteFlag;
+    }
+
+    public void setFavoriteFlag(Byte favoriteFlag) {
+        this.favoriteFlag = favoriteFlag;
+    }
+
     @Override
     public String toString() {
         return "AlbumFavorite{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/AlbumMusicRelate.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 专辑曲谱关联表
  */
-@Data
 @TableName("album_music_relate")
 @ApiModel(value = "AlbumMusicRelate对象", description = "专辑曲谱关联表")
 public class AlbumMusicRelate implements Serializable {
@@ -57,6 +55,54 @@ public class AlbumMusicRelate implements Serializable {
 	@TableField(value = "create_by_")
     private Long createBy;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getAlbumId() {
+        return albumId;
+    }
+
+    public void setAlbumId(Long albumId) {
+        this.albumId = albumId;
+    }
+
+    public Long getMusicSheetId() {
+        return musicSheetId;
+    }
+
+    public void setMusicSheetId(Long musicSheetId) {
+        this.musicSheetId = musicSheetId;
+    }
+
+    public Byte getSortNumber() {
+        return sortNumber;
+    }
+
+    public void setSortNumber(Byte sortNumber) {
+        this.sortNumber = sortNumber;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
     @Override
     public String toString() {
         return "AlbumMusicRelate{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicAlbum.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 专辑表
  */
-@Data
 @TableName("music_album")
 @ApiModel(value = "MusicAlbum对象", description = "专辑表")
 public class MusicAlbum implements Serializable {
@@ -101,6 +99,110 @@ public class MusicAlbum implements Serializable {
 	@TableField(value = "update_by_")
     private Long updateBy;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getAlbumName() {
+        return albumName;
+    }
+
+    public void setAlbumName(String albumName) {
+        this.albumName = albumName;
+    }
+
+    public String getAlbumDesc() {
+        return albumDesc;
+    }
+
+    public void setAlbumDesc(String albumDesc) {
+        this.albumDesc = albumDesc;
+    }
+
+    public String getAlbumTag() {
+        return albumTag;
+    }
+
+    public void setAlbumTag(String albumTag) {
+        this.albumTag = albumTag;
+    }
+
+    public String getAlbumCoverUrl() {
+        return albumCoverUrl;
+    }
+
+    public void setAlbumCoverUrl(String albumCoverUrl) {
+        this.albumCoverUrl = albumCoverUrl;
+    }
+
+    public Byte getAlbumStatus() {
+        return albumStatus;
+    }
+
+    public void setAlbumStatus(Byte albumStatus) {
+        this.albumStatus = albumStatus;
+    }
+
+    public Integer getSortNumber() {
+        return sortNumber;
+    }
+
+    public void setSortNumber(Integer sortNumber) {
+        this.sortNumber = sortNumber;
+    }
+
+    public Byte getHotFlag() {
+        return hotFlag;
+    }
+
+    public void setHotFlag(Byte hotFlag) {
+        this.hotFlag = hotFlag;
+    }
+
+    public Byte getTopFlag() {
+        return topFlag;
+    }
+
+    public void setTopFlag(Byte topFlag) {
+        this.topFlag = topFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+
     @Override
     public String toString() {
         return "MusicAlbum{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicFavorite.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 乐谱收藏表
  */
-@Data
 @TableName("music_favorite")
 @ApiModel(value = "MusicFavorite对象", description = "乐谱收藏表")
 public class MusicFavorite implements Serializable {
@@ -51,6 +49,46 @@ public class MusicFavorite implements Serializable {
 	@TableField(value = "favorite_flag_")
     private Byte favoriteFlag;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getMusicSheetId() {
+        return musicSheetId;
+    }
+
+    public void setMusicSheetId(Long musicSheetId) {
+        this.musicSheetId = musicSheetId;
+    }
+
+    public Date getFavoriteTime() {
+        return favoriteTime;
+    }
+
+    public void setFavoriteTime(Date favoriteTime) {
+        this.favoriteTime = favoriteTime;
+    }
+
+    public Byte getFavoriteFlag() {
+        return favoriteFlag;
+    }
+
+    public void setFavoriteFlag(Byte favoriteFlag) {
+        this.favoriteFlag = favoriteFlag;
+    }
+
     @Override
     public String toString() {
         return "MusicFavorite{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,7 +13,6 @@ import java.math.BigDecimal;
 /**
  * 曲谱表
  */
-@Data
 @TableName("music_sheet")
 @ApiModel(value = "MusicSheet对象", description = "曲谱表")
 public class MusicSheet implements Serializable {
@@ -168,6 +166,198 @@ public class MusicSheet implements Serializable {
 	@TableField(value = "remark_")
     private String remark;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getMusicSheetName() {
+        return musicSheetName;
+    }
+
+    public void setMusicSheetName(String musicSheetName) {
+        this.musicSheetName = musicSheetName;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getComposer() {
+        return composer;
+    }
+
+    public void setComposer(String composer) {
+        this.composer = composer;
+    }
+
+    public String getMusicSubject() {
+        return musicSubject;
+    }
+
+    public void setMusicSubject(String musicSubject) {
+        this.musicSubject = musicSubject;
+    }
+
+    public String getAudioType() {
+        return audioType;
+    }
+
+    public void setAudioType(String audioType) {
+        this.audioType = audioType;
+    }
+
+    public String getMusicTag() {
+        return musicTag;
+    }
+
+    public void setMusicTag(String musicTag) {
+        this.musicTag = musicTag;
+    }
+
+    public Integer getPlaySpeed() {
+        return playSpeed;
+    }
+
+    public void setPlaySpeed(Integer playSpeed) {
+        this.playSpeed = playSpeed;
+    }
+
+    public Byte getCanEvaluate() {
+        return canEvaluate;
+    }
+
+    public void setCanEvaluate(Byte canEvaluate) {
+        this.canEvaluate = canEvaluate;
+    }
+
+    public Byte getShowFingering() {
+        return showFingering;
+    }
+
+    public void setShowFingering(Byte showFingering) {
+        this.showFingering = showFingering;
+    }
+
+    public Byte getChargeType() {
+        return chargeType;
+    }
+
+    public void setChargeType(Byte chargeType) {
+        this.chargeType = chargeType;
+    }
+
+    public Byte getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Byte auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public Integer getSortNumber() {
+        return sortNumber;
+    }
+
+    public void setSortNumber(Integer sortNumber) {
+        this.sortNumber = sortNumber;
+    }
+
+    public Byte getTopFlag() {
+        return topFlag;
+    }
+
+    public void setTopFlag(Byte topFlag) {
+        this.topFlag = topFlag;
+    }
+
+    public Byte getHotFlag() {
+        return hotFlag;
+    }
+
+    public void setHotFlag(Byte hotFlag) {
+        this.hotFlag = hotFlag;
+    }
+
+    public BigDecimal getMusicPrice() {
+        return musicPrice;
+    }
+
+    public void setMusicPrice(BigDecimal musicPrice) {
+        this.musicPrice = musicPrice;
+    }
+
+    public String getAudioFileUrl() {
+        return audioFileUrl;
+    }
+
+    public void setAudioFileUrl(String audioFileUrl) {
+        this.audioFileUrl = audioFileUrl;
+    }
+
+    public String getXmlFileUrl() {
+        return xmlFileUrl;
+    }
+
+    public void setXmlFileUrl(String xmlFileUrl) {
+        this.xmlFileUrl = xmlFileUrl;
+    }
+
+    public Byte getHasBeat() {
+        return hasBeat;
+    }
+
+    public void setHasBeat(Byte hasBeat) {
+        this.hasBeat = hasBeat;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     @Override
     public String toString() {
         return "MusicSheet{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheetAccompaniment.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 曲谱伴奏表
  */
-@Data
 @TableName("music_sheet_accompaniment")
 @ApiModel(value = "MusicSheetAccompaniment对象", description = "曲谱伴奏表")
 public class MusicSheetAccompaniment implements Serializable {
@@ -63,6 +61,62 @@ public class MusicSheetAccompaniment implements Serializable {
 	@TableField(value = "create_by_")
     private Long createBy;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getMusicSheetId() {
+        return musicSheetId;
+    }
+
+    public void setMusicSheetId(Long musicSheetId) {
+        this.musicSheetId = musicSheetId;
+    }
+
+    public String getMusicSubject() {
+        return musicSubject;
+    }
+
+    public void setMusicSubject(String musicSubject) {
+        this.musicSubject = musicSubject;
+    }
+
+    public String getAudioFileUrl() {
+        return audioFileUrl;
+    }
+
+    public void setAudioFileUrl(String audioFileUrl) {
+        this.audioFileUrl = audioFileUrl;
+    }
+
+    public Byte getSortNumber() {
+        return sortNumber;
+    }
+
+    public void setSortNumber(Byte sortNumber) {
+        this.sortNumber = sortNumber;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
     @Override
     public String toString() {
         return "MusicSheetAccompaniment{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheetPurchaseRecord.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,7 +13,6 @@ import java.math.BigDecimal;
 /**
  * 曲谱购买记录表
  */
-@Data
 @TableName("music_sheet_purchase_record")
 @ApiModel(value = "MusicSheetPurchaseRecord对象", description = "曲谱购买记录表")
 public class MusicSheetPurchaseRecord implements Serializable {
@@ -70,6 +68,70 @@ public class MusicSheetPurchaseRecord implements Serializable {
 	@TableField(value = "order_status_")
     private Byte orderStatus;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getMusicSheetId() {
+        return musicSheetId;
+    }
+
+    public void setMusicSheetId(Long musicSheetId) {
+        this.musicSheetId = musicSheetId;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public Date getPurchaseTime() {
+        return purchaseTime;
+    }
+
+    public void setPurchaseTime(Date purchaseTime) {
+        this.purchaseTime = purchaseTime;
+    }
+
+    public BigDecimal getPurchasePrice() {
+        return purchasePrice;
+    }
+
+    public void setPurchasePrice(BigDecimal purchasePrice) {
+        this.purchasePrice = purchasePrice;
+    }
+
+    public Byte getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Byte orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
     @Override
     public String toString() {
         return "MusicSheetPurchaseRecord{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Order.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,7 +16,6 @@ import java.math.BigDecimal;
 /**
  * 平台订单表
  */
-@Data
 @TableName("order")
 @ApiModel(value = "Order对象", description = "平台订单表")
 public class Order implements Serializable {
@@ -175,6 +173,206 @@ public class Order implements Serializable {
 	@TableField(value = "pay_fail_msg_")
     private String payFailMsg;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getMerchId() {
+        return merchId;
+    }
+
+    public void setMerchId(Long merchId) {
+        this.merchId = merchId;
+    }
+
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
+    public String getOrderDesc() {
+        return orderDesc;
+    }
+
+    public void setOrderDesc(String orderDesc) {
+        this.orderDesc = orderDesc;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public BigDecimal getOriginalPrice() {
+        return originalPrice;
+    }
+
+    public void setOriginalPrice(BigDecimal originalPrice) {
+        this.originalPrice = originalPrice;
+    }
+
+    public BigDecimal getExpectPrice() {
+        return expectPrice;
+    }
+
+    public void setExpectPrice(BigDecimal expectPrice) {
+        this.expectPrice = expectPrice;
+    }
+
+    public BigDecimal getActualPrice() {
+        return actualPrice;
+    }
+
+    public void setActualPrice(BigDecimal actualPrice) {
+        this.actualPrice = actualPrice;
+    }
+
+    public BigDecimal getCouponAmount() {
+        return couponAmount;
+    }
+
+    public void setCouponAmount(BigDecimal couponAmount) {
+        this.couponAmount = couponAmount;
+    }
+
+    public BigDecimal getPlantformFee() {
+        return plantformFee;
+    }
+
+    public void setPlantformFee(BigDecimal plantformFee) {
+        this.plantformFee = plantformFee;
+    }
+
+    public BigDecimal getPlantformFeeRate() {
+        return plantformFeeRate;
+    }
+
+    public void setPlantformFeeRate(BigDecimal plantformFeeRate) {
+        this.plantformFeeRate = plantformFeeRate;
+    }
+
+    public BigDecimal getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(BigDecimal refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    public String getUserNote() {
+        return userNote;
+    }
+
+    public void setUserNote(String userNote) {
+        this.userNote = userNote;
+    }
+
+    public String getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    public Date getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(Date refundTime) {
+        this.refundTime = refundTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
+
+    public String getPayChannel() {
+        return payChannel;
+    }
+
+    public void setPayChannel(String payChannel) {
+        this.payChannel = payChannel;
+    }
+
+    public BigDecimal getPayAmt() {
+        return payAmt;
+    }
+
+    public void setPayAmt(BigDecimal payAmt) {
+        this.payAmt = payAmt;
+    }
+
+    public Date getArrivalTime() {
+        return arrivalTime;
+    }
+
+    public void setArrivalTime(Date arrivalTime) {
+        this.arrivalTime = arrivalTime;
+    }
+
+    public String getPayFailMsg() {
+        return payFailMsg;
+    }
+
+    public void setPayFailMsg(String payFailMsg) {
+        this.payFailMsg = payFailMsg;
+    }
+
     @Override
     public String toString() {
         return "Order{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/OrderDetail.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,7 +15,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 平台订单表
  */
-@Data
 @TableName("order_detail")
 @ApiModel(value = "OrderDetail对象", description = "平台订单表")
 public class OrderDetail implements Serializable {
@@ -54,6 +52,54 @@ public class OrderDetail implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Long getBizId() {
+        return bizId;
+    }
+
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
+    }
+
+    public String getBizContent() {
+        return bizContent;
+    }
+
+    public void setBizContent(String bizContent) {
+        this.bizContent = bizContent;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     @Override
     public String toString() {
         return "OrderDetail{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/OrderRefunds.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,7 +16,6 @@ import java.math.BigDecimal;
 /**
  * 用户退款表
  */
-@Data
 @TableName("order_refunds")
 @ApiModel(value = "OrderRefunds对象", description = "用户退款表")
 public class OrderRefunds implements Serializable {
@@ -73,6 +71,94 @@ public class OrderRefunds implements Serializable {
 	@TableField(value = "remark_")
     private String remark;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public BigDecimal getApplyAmount() {
+        return applyAmount;
+    }
+
+    public void setApplyAmount(BigDecimal applyAmount) {
+        this.applyAmount = applyAmount;
+    }
+
+    public BigDecimal getActualAmount() {
+        return actualAmount;
+    }
+
+    public void setActualAmount(BigDecimal actualAmount) {
+        this.actualAmount = actualAmount;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public Long getOperateUserId() {
+        return operateUserId;
+    }
+
+    public void setOperateUserId(Long operateUserId) {
+        this.operateUserId = operateUserId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     @Override
     public String toString() {
         return "OrderRefunds{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Teacher.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -20,7 +19,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 教师表
  */
-@Data
 @TableName("teacher")
 @ApiModel(value = "Teacher对象", description = "教师表")
 public class Teacher extends SysUser implements Serializable {
@@ -134,6 +132,150 @@ public class Teacher extends SysUser implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getEducationBackground() {
+        return educationBackground;
+    }
+
+    public void setEducationBackground(String educationBackground) {
+        this.educationBackground = educationBackground;
+    }
+
+    public String getGraduateSchool() {
+        return graduateSchool;
+    }
+
+    public void setGraduateSchool(String graduateSchool) {
+        this.graduateSchool = graduateSchool;
+    }
+
+    public String getTechnicalTitles() {
+        return technicalTitles;
+    }
+
+    public void setTechnicalTitles(String technicalTitles) {
+        this.technicalTitles = technicalTitles;
+    }
+
+    public String getWorkUnit() {
+        return workUnit;
+    }
+
+    public void setWorkUnit(String workUnit) {
+        this.workUnit = workUnit;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Integer getEntryStatus() {
+        return entryStatus;
+    }
+
+    public void setEntryStatus(Integer entryStatus) {
+        this.entryStatus = entryStatus;
+    }
+
+    public Date getEntryAuthDate() {
+        return entryAuthDate;
+    }
+
+    public void setEntryAuthDate(Date entryAuthDate) {
+        this.entryAuthDate = entryAuthDate;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
+    public String getMusicianAuthStatus() {
+        return musicianAuthStatus;
+    }
+
+    public void setMusicianAuthStatus(String musicianAuthStatus) {
+        this.musicianAuthStatus = musicianAuthStatus;
+    }
+
+    public Date getMusicianDate() {
+        return musicianDate;
+    }
+
+    public void setMusicianDate(Date musicianDate) {
+        this.musicianDate = musicianDate;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getGradCertificate() {
+        return gradCertificate;
+    }
+
+    public void setGradCertificate(String gradCertificate) {
+        this.gradCertificate = gradCertificate;
+    }
+
+    public String getDegreeCertificate() {
+        return degreeCertificate;
+    }
+
+    public void setDegreeCertificate(String degreeCertificate) {
+        this.degreeCertificate = degreeCertificate;
+    }
+
+    public String getTeacherCertificate() {
+        return teacherCertificate;
+    }
+
+    public void setTeacherCertificate(String teacherCertificate) {
+        this.teacherCertificate = teacherCertificate;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     @Override
     public String toString() {
         return "Teacher{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthEntryRecord.java

@@ -8,23 +8,15 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 老师入驻审核表
  */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
 @TableName("teacher_auth_entry_record")
 @ApiModel(value = "TeacherAuthEntryRecord对象", description = "老师入驻审核表")
 public class TeacherAuthEntryRecord implements Serializable {
@@ -108,11 +100,124 @@ public class TeacherAuthEntryRecord implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
+
 	@TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
+    public String getGraduateSchool() {
+        return graduateSchool;
+    }
+
+    public void setGraduateSchool(String graduateSchool) {
+        this.graduateSchool = graduateSchool;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getGradCertificate() {
+        return gradCertificate;
+    }
+
+    public void setGradCertificate(String gradCertificate) {
+        this.gradCertificate = gradCertificate;
+    }
+
+    public String getDegreeCertificate() {
+        return degreeCertificate;
+    }
+
+    public void setDegreeCertificate(String degreeCertificate) {
+        this.degreeCertificate = degreeCertificate;
+    }
+
+    public String getTeacherCertificate() {
+        return teacherCertificate;
+    }
+
+    public void setTeacherCertificate(String teacherCertificate) {
+        this.teacherCertificate = teacherCertificate;
+    }
+
+    public Integer getTeacherAuthStatus() {
+        return teacherAuthStatus;
+    }
+
+    public void setTeacherAuthStatus(Integer teacherAuthStatus) {
+        this.teacherAuthStatus = teacherAuthStatus;
+    }
+
+    public Long getVerifyUserId() {
+        return verifyUserId;
+    }
+
+    public void setVerifyUserId(Long verifyUserId) {
+        this.verifyUserId = verifyUserId;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     @Override
     public String toString() {
         return "TeacherAuthEntryRecord{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthMusicianRecord.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,7 +15,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 老师音乐人审核表
  */
-@Data
 @TableName("teacher_auth_musician_record")
 @ApiModel(value = "TeacherAuthMusicianRecord对象", description = "老师音乐人审核表")
 public class TeacherAuthMusicianRecord implements Serializable {
@@ -60,6 +58,62 @@ public class TeacherAuthMusicianRecord implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Integer getTeacherAuthStatus() {
+        return teacherAuthStatus;
+    }
+
+    public void setTeacherAuthStatus(Integer teacherAuthStatus) {
+        this.teacherAuthStatus = teacherAuthStatus;
+    }
+
+    public Long getVerifyUserId() {
+        return verifyUserId;
+    }
+
+    public void setVerifyUserId(Long verifyUserId) {
+        this.verifyUserId = verifyUserId;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     @Override
     public String toString() {
         return "TeacherAuthMusicianRecord{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherWithdrawal.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,7 +16,6 @@ import java.math.BigDecimal;
 /**
  * 老师账户提现表
  */
-@Data
 @TableName("teacher_withdrawal")
 @ApiModel(value = "TeacherWithdrawal对象", description = "老师账户提现表")
 public class TeacherWithdrawal implements Serializable {
@@ -107,6 +105,110 @@ public class TeacherWithdrawal implements Serializable {
 	@TableField(value = "status_")
     private Byte status;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getUserAccountRecordId() {
+        return userAccountRecordId;
+    }
+
+    public void setUserAccountRecordId(Long userAccountRecordId) {
+        this.userAccountRecordId = userAccountRecordId;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public BigDecimal getPlantformFee() {
+        return plantformFee;
+    }
+
+    public void setPlantformFee(BigDecimal plantformFee) {
+        this.plantformFee = plantformFee;
+    }
+
+    public String getActualAmount() {
+        return actualAmount;
+    }
+
+    public void setActualAmount(String actualAmount) {
+        this.actualAmount = actualAmount;
+    }
+
+    public String getBankCard() {
+        return bankCard;
+    }
+
+    public void setBankCard(String bankCard) {
+        this.bankCard = bankCard;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getBankFlowNo() {
+        return bankFlowNo;
+    }
+
+    public void setBankFlowNo(String bankFlowNo) {
+        this.bankFlowNo = bankFlowNo;
+    }
+
+    public Date getTransferTime() {
+        return transferTime;
+    }
+
+    public void setTransferTime(Date transferTime) {
+        this.transferTime = transferTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
     @Override
     public String toString() {
         return "TeacherWithdrawal{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/UserAccount.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,7 +16,6 @@ import java.math.BigDecimal;
 /**
  * 老师账户表
  */
-@Data
 @TableName("user_account")
 @ApiModel(value = "UserAccount对象", description = "老师账户表")
 public class UserAccount implements Serializable {
@@ -69,6 +67,62 @@ public class UserAccount implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public BigDecimal getAmountTotal() {
+        return amountTotal;
+    }
+
+    public void setAmountTotal(BigDecimal amountTotal) {
+        this.amountTotal = amountTotal;
+    }
+
+    public BigDecimal getAmountUsable() {
+        return amountUsable;
+    }
+
+    public void setAmountUsable(BigDecimal amountUsable) {
+        this.amountUsable = amountUsable;
+    }
+
+    public BigDecimal getAmountFrozen() {
+        return amountFrozen;
+    }
+
+    public void setAmountFrozen(BigDecimal amountFrozen) {
+        this.amountFrozen = amountFrozen;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     @Override
     public String toString() {
         return "UserAccount{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/UserAccountRecord.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,7 +16,6 @@ import java.math.BigDecimal;
 /**
  * 老师账户流水表
  */
-@Data
 @TableName("user_account_record")
 @ApiModel(value = "UserAccountRecord对象", description = "老师账户流水表")
 public class UserAccountRecord implements Serializable {
@@ -79,6 +77,78 @@ public class UserAccountRecord implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public BigDecimal getTransAmount() {
+        return transAmount;
+    }
+
+    public void setTransAmount(BigDecimal transAmount) {
+        this.transAmount = transAmount;
+    }
+
+    public BigDecimal getAccountBalance() {
+        return accountBalance;
+    }
+
+    public void setAccountBalance(BigDecimal accountBalance) {
+        this.accountBalance = accountBalance;
+    }
+
+    public Integer getInOrOut() {
+        return inOrOut;
+    }
+
+    public void setInOrOut(Integer inOrOut) {
+        this.inOrOut = inOrOut;
+    }
+
+    public Integer getBizType() {
+        return bizType;
+    }
+
+    public void setBizType(Integer bizType) {
+        this.bizType = bizType;
+    }
+
+    public Long getBizId() {
+        return bizId;
+    }
+
+    public void setBizId(Long bizId) {
+        this.bizId = bizId;
+    }
+
+    public String getBizName() {
+        return bizName;
+    }
+
+    public void setBizName(String bizName) {
+        this.bizName = bizName;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     @Override
     public String toString() {
         return "UserAccountRecord{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/UserBankCard.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 老师绑卡记录表
  */
-@Data
 @TableName("user_bank_card")
 @ApiModel(value = "UserBankCard对象", description = "老师绑卡记录表")
 public class UserBankCard implements Serializable {
@@ -90,6 +88,94 @@ public class UserBankCard implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getBankCard() {
+        return bankCard;
+    }
+
+    public void setBankCard(String bankCard) {
+        this.bankCard = bankCard;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public Byte getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Byte delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Byte getIsDefault() {
+        return isDefault;
+    }
+
+    public void setIsDefault(Byte isDefault) {
+        this.isDefault = isDefault;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     @Override
     public String toString() {
         return "UserBankCard{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonEvaluate.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 视频课学员评价
  */
-@Data
 @TableName("video_lesson_evaluate")
 @ApiModel(value = "VideoLessonEvaluate对象", description = "视频课学员评价")
 public class VideoLessonEvaluate implements Serializable {
@@ -51,6 +49,46 @@ public class VideoLessonEvaluate implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date evaluateTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getVideoId() {
+        return videoId;
+    }
+
+    public void setVideoId(Long videoId) {
+        this.videoId = videoId;
+    }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Date getEvaluateTime() {
+        return evaluateTime;
+    }
+
+    public void setEvaluateTime(Date evaluateTime) {
+        this.evaluateTime = evaluateTime;
+    }
+
     @Override
     public String toString() {
         return "VideoLessonEvaluate{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonGroup.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 视频课基本信息表
  */
-@Data
 @TableName("video_lesson_group")
 @ApiModel(value = "VideoLessonGroup对象", description = "视频课基本信息表")
 public class VideoLessonGroup implements Serializable {
@@ -113,6 +111,126 @@ public class VideoLessonGroup implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLessonName() {
+        return lessonName;
+    }
+
+    public void setLessonName(String lessonName) {
+        this.lessonName = lessonName;
+    }
+
+    public String getLessonSubject() {
+        return lessonSubject;
+    }
+
+    public void setLessonSubject(String lessonSubject) {
+        this.lessonSubject = lessonSubject;
+    }
+
+    public String getLessonDesc() {
+        return lessonDesc;
+    }
+
+    public void setLessonDesc(String lessonDesc) {
+        this.lessonDesc = lessonDesc;
+    }
+
+    public Integer getLessonPrice() {
+        return lessonPrice;
+    }
+
+    public void setLessonPrice(Integer lessonPrice) {
+        this.lessonPrice = lessonPrice;
+    }
+
+    public String getLessonCoverUrl() {
+        return lessonCoverUrl;
+    }
+
+    public void setLessonCoverUrl(String lessonCoverUrl) {
+        this.lessonCoverUrl = lessonCoverUrl;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Integer getLessonCount() {
+        return lessonCount;
+    }
+
+    public void setLessonCount(Integer lessonCount) {
+        this.lessonCount = lessonCount;
+    }
+
+    public Integer getSortNumber() {
+        return sortNumber;
+    }
+
+    public void setSortNumber(Integer sortNumber) {
+        this.sortNumber = sortNumber;
+    }
+
+    public String getLessonTag() {
+        return lessonTag;
+    }
+
+    public void setLessonTag(String lessonTag) {
+        this.lessonTag = lessonTag;
+    }
+
+    public Byte getTopFlag() {
+        return topFlag;
+    }
+
+    public void setTopFlag(Byte topFlag) {
+        this.topFlag = topFlag;
+    }
+
+    public Byte getHotFlag() {
+        return hotFlag;
+    }
+
+    public void setHotFlag(Byte hotFlag) {
+        this.hotFlag = hotFlag;
+    }
+
+    public Byte getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Byte auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     @Override
     public String toString() {
         return "VideoLessonGroup{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonGroupDetail.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 视频课明细表
  */
-@Data
 @TableName("video_lesson_group_detail")
 @ApiModel(value = "VideoLessonGroupDetail对象", description = "视频课明细表")
 public class VideoLessonGroupDetail implements Serializable {
@@ -95,6 +93,102 @@ public class VideoLessonGroupDetail implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getVideoLessonGroupId() {
+        return videoLessonGroupId;
+    }
+
+    public void setVideoLessonGroupId(Long videoLessonGroupId) {
+        this.videoLessonGroupId = videoLessonGroupId;
+    }
+
+    public String getVideoTitle() {
+        return videoTitle;
+    }
+
+    public void setVideoTitle(String videoTitle) {
+        this.videoTitle = videoTitle;
+    }
+
+    public String getVideoContent() {
+        return videoContent;
+    }
+
+    public void setVideoContent(String videoContent) {
+        this.videoContent = videoContent;
+    }
+
+    public String getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
+    public String getCoverUrl() {
+        return coverUrl;
+    }
+
+    public void setCoverUrl(String coverUrl) {
+        this.coverUrl = coverUrl;
+    }
+
+    public Byte getChargeFlag() {
+        return chargeFlag;
+    }
+
+    public void setChargeFlag(Byte chargeFlag) {
+        this.chargeFlag = chargeFlag;
+    }
+
+    public Integer getSortNumber() {
+        return sortNumber;
+    }
+
+    public void setSortNumber(Integer sortNumber) {
+        this.sortNumber = sortNumber;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     @Override
     public String toString() {
         return "VideoLessonGroupDetail{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonPurchaseRecord.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,7 +13,6 @@ import java.math.BigDecimal;
 /**
  * 视频课购买记录表
  */
-@Data
 @TableName("video_lesson_purchase_record")
 @ApiModel(value = "VideoLessonPurchaseRecord对象", description = "视频课购买记录表")
 public class VideoLessonPurchaseRecord implements Serializable {
@@ -64,6 +62,62 @@ public class VideoLessonPurchaseRecord implements Serializable {
 	@TableField(value = "order_status_")
     private Byte orderStatus;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getVideoLessonGroupId() {
+        return videoLessonGroupId;
+    }
+
+    public void setVideoLessonGroupId(Long videoLessonGroupId) {
+        this.videoLessonGroupId = videoLessonGroupId;
+    }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public Date getPurchaseTime() {
+        return purchaseTime;
+    }
+
+    public void setPurchaseTime(Date purchaseTime) {
+        this.purchaseTime = purchaseTime;
+    }
+
+    public BigDecimal getPayMoney() {
+        return payMoney;
+    }
+
+    public void setPayMoney(BigDecimal payMoney) {
+        this.payMoney = payMoney;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Byte getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Byte orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
     @Override
     public String toString() {
         return "VideoLessonPurchaseRecord{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonStudyRecord.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +12,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 视频课学习记录表
  */
-@Data
 @TableName("video_lesson_study_record")
 @ApiModel(value = "VideoLessonStudyRecord对象", description = "视频课学习记录表")
 public class VideoLessonStudyRecord implements Serializable {
@@ -65,6 +63,62 @@ public class VideoLessonStudyRecord implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date finishTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getVideoLessonGroupId() {
+        return videoLessonGroupId;
+    }
+
+    public void setVideoLessonGroupId(Long videoLessonGroupId) {
+        this.videoLessonGroupId = videoLessonGroupId;
+    }
+
+    public Long getVideoId() {
+        return videoId;
+    }
+
+    public void setVideoId(Long videoId) {
+        this.videoId = videoId;
+    }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public Byte getFinishFlag() {
+        return finishFlag;
+    }
+
+    public void setFinishFlag(Byte finishFlag) {
+        this.finishFlag = finishFlag;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(Date finishTime) {
+        this.finishTime = finishTime;
+    }
+
     @Override
     public String toString() {
         return "VideoLessonStudyRecord{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VipCard.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,7 +15,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 会员卡表
  */
-@Data
 @TableName("vip_card")
 @ApiModel(value = "VipCard对象", description = "会员卡表")
 public class VipCard implements Serializable {
@@ -78,6 +76,70 @@ public class VipCard implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date endTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getTimeType() {
+        return timeType;
+    }
+
+    public void setTimeType(Integer timeType) {
+        this.timeType = timeType;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
     @Override
     public String toString() {
         return "VipCard{" +

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AuthPageEnum.java

@@ -1,29 +0,0 @@
-package com.yonge.cooleshow.biz.dal.enums;
-
-import com.yonge.cooleshow.common.enums.BaseEnum;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 老师认证页面
- * @Author: liweifan
- * @Data: 2022/3/16 10:14
- */
-@Getter
-@AllArgsConstructor
-public enum AuthPageEnum implements BaseEnum<Integer, AuthPageEnum> {
-    ONE(1, "实名认证页面"),
-    TWO(2, "基本信息页面"),
-    THREE(3, "学历信息页面");
-
-    private Integer code;
-
-    private String msg;
-
-    @Override
-    public Integer getCode() {
-        return null;
-    }
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AuthStatusEnum.java

@@ -1,8 +1,6 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
 import com.yonge.cooleshow.common.enums.BaseEnum;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
 
 /**
  * 认证审核状态
@@ -10,8 +8,6 @@ import lombok.Getter;
  * @Author: liweifan
  * @Data: 2022/3/16 10:19
  */
-@Getter
-@AllArgsConstructor
 public enum AuthStatusEnum implements BaseEnum<Integer, AuthStatusEnum> {
     DOING(1, "审核中"),
     PASS(2, "通过"),
@@ -21,6 +17,15 @@ public enum AuthStatusEnum implements BaseEnum<Integer, AuthStatusEnum> {
 
     private String msg;
 
+    AuthStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
     @Override
     public Integer getCode() {
         return null;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SubjectService.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
+import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.BaseService;
 
@@ -29,4 +30,11 @@ public interface SubjectService extends BaseService<Long, Subject> {
 
 	List<Subject> findBySubjectByIdList(String subjectIdList);
 
+	/***
+	 * 查询科目选择框
+	 * @author liweifan
+	 * @updateTime 2022/3/21 17:23
+	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo>
+	 */
+	List<SubjectSelectVo> subjectSelect();
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TeacherAuthEntryRecordService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.AuthOperaDto;
 import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherAuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -20,7 +21,7 @@ public interface TeacherAuthEntryRecordService extends IService<TeacherAuthEntry
      * @author liweifan
  	 * @date 2022-03-18
      */
-    IPage<TeacherAuthEntryRecordVo> selectPage(IPage<TeacherAuthEntryRecordVo> page, TeacherAuthEntryRecord teacherAuthEntryRecord);
+    IPage<TeacherAuthEntryRecordVo> selectPage(IPage<TeacherAuthEntryRecordVo> page, TeacherAuthEntryRecordSearch search);
     /***
      * 老师入驻申请
      * @author liweifan

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SubjectServiceImpl.java

@@ -1,8 +1,10 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
+import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -90,4 +92,42 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
     public List<Subject> findBySubjectByIdList(String subjectIdList) {
         return subjectDao.findBySubjectByIdList(subjectIdList);
     }
+
+    @Override
+    public List<SubjectSelectVo> subjectSelect() {
+        List<Subject> allList = subjectDao.findAll(new HashMap<>());
+        List<SubjectSelectVo> allListVo = new ArrayList<>();
+        allList.stream().forEach(o->{
+            SubjectSelectVo subjectSelectVo = new SubjectSelectVo();
+            try {
+                BeanUtils.copyProperties(o,subjectSelectVo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            allListVo.add(subjectSelectVo);
+        });
+
+        List<SubjectSelectVo> parents = allListVo.stream()
+                .filter(o -> (!o.getParentSubjectId().equals(0) && null != o.getParentSubjectId()))
+                .collect(Collectors.toList());
+
+        List<SubjectSelectVo> subjects = allListVo.stream()
+                .filter(o -> (null == o.getParentSubjectId() || o.getParentSubjectId().equals(0)))
+                .collect(Collectors.toList());
+
+        for (SubjectSelectVo parent : parents) {
+            if(null == parent.getId()){
+                continue;
+            }
+            for (SubjectSelectVo subject : subjects) {
+                if(null == subject.getId() || null == subject.getParentSubjectId()){
+                    continue;
+                }
+                if(subject.getParentSubjectId().equals(parent.getId())){
+                    parent.getChildren().add(subject);
+                }
+            }
+        }
+        return parents;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.AuthOperaDto;
 import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherAuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -16,8 +17,6 @@ import com.yonge.cooleshow.biz.dal.dao.TeacherAuthEntryRecordDao;
 import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.lang.reflect.InvocationTargetException;
-
 
 @Service
 public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEntryRecordDao, TeacherAuthEntryRecord> implements TeacherAuthEntryRecordService {
@@ -26,8 +25,8 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
      * 分页查询
      */
     @Override
-    public IPage<TeacherAuthEntryRecordVo> selectPage(IPage<TeacherAuthEntryRecordVo> page, TeacherAuthEntryRecord teacherAuthEntryRecord) {
-        return page.setRecords(baseMapper.selectPage(page, teacherAuthEntryRecord));
+    public IPage<TeacherAuthEntryRecordVo> selectPage(IPage<TeacherAuthEntryRecordVo> page, TeacherAuthEntryRecordSearch search) {
+        return page.setRecords(baseMapper.selectPage(page, search));
     }
 
     @Override
@@ -54,11 +53,10 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
 
     @Override
     public HttpResponseResult<Boolean> doAuth(AuthOperaDto authOperaDto, SysUser sysUser) {
-        TeacherAuthEntryRecord build = TeacherAuthEntryRecord.builder()
-                .id(authOperaDto.getId())
-                .teacherAuthStatus(authOperaDto.getIsPass() ? AuthStatusEnum.PASS.getCode() : AuthStatusEnum.UNPASS.getCode())
-                .reason(authOperaDto.getReason())
-                .build();
+        TeacherAuthEntryRecord build = new TeacherAuthEntryRecord();
+        build.setId(authOperaDto.getId());
+        build.setTeacherAuthStatus(authOperaDto.getPass() ? AuthStatusEnum.PASS.getCode() : AuthStatusEnum.UNPASS.getCode());
+        build.setReason(authOperaDto.getReason());
         return HttpResponseResult.succeed(baseMapper.updateById(build) > 0);
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/BasePage.java

@@ -1,7 +1,6 @@
 package com.yonge.cooleshow.biz.dal.support;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -12,7 +11,6 @@ import java.util.List;
  *
  * @author Chill
  */
-@Data
 public class BasePage<T> implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -36,6 +34,42 @@ public class BasePage<T> implements Serializable {
 	 */
 	private long current = 1;
 
+	public static long getSerialVersionUID() {
+		return serialVersionUID;
+	}
+
+	public List<T> getRecords() {
+		return records;
+	}
+
+	public void setRecords(List<T> records) {
+		this.records = records;
+	}
+
+	public long getTotal() {
+		return total;
+	}
+
+	public void setTotal(long total) {
+		this.total = total;
+	}
+
+	public long getSize() {
+		return size;
+	}
+
+	public void setSize(long size) {
+		this.size = size;
+	}
+
+	public long getCurrent() {
+		return current;
+	}
+
+	public void setCurrent(long current) {
+		this.current = current;
+	}
+
 	/**
 	 * mybatis-plus分页模型转化
 	 *

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/Query.java

@@ -2,16 +2,12 @@ package com.yonge.cooleshow.biz.dal.support;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
 
 /**
  * 分页工具
  *
  * @author Chill
  */
-@Data
-@Accessors(chain = true)
 @ApiModel(description = "查询条件")
 public class Query {
 
@@ -39,4 +35,35 @@ public class Query {
 	@ApiModelProperty(hidden = true)
 	private String descs;
 
+	public Integer getPage() {
+		return page;
+	}
+
+	public void setPage(Integer page) {
+		this.page = page;
+	}
+
+	public Integer getRows() {
+		return rows;
+	}
+
+	public void setRows(Integer rows) {
+		this.rows = rows;
+	}
+
+	public String getAscs() {
+		return ascs;
+	}
+
+	public void setAscs(String ascs) {
+		this.ascs = ascs;
+	}
+
+	public String getDescs() {
+		return descs;
+	}
+
+	public void setDescs(String descs) {
+		this.descs = descs;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/SubjectSelectVo.java

@@ -0,0 +1,21 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.Subject;
+
+import java.util.List;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/21 17:18
+ */
+public class SubjectSelectVo extends Subject {
+    private List<SubjectSelectVo> children;
+
+    public List<SubjectSelectVo> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<SubjectSelectVo> children) {
+        this.children = children;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherApplyDetail.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import java.io.Serializable;
 
@@ -13,7 +12,6 @@ import java.io.Serializable;
  * @Author: liweifan
  * @Data: 2022/3/18 14:56
  */
-@Data
 @ApiModel(value = "TeacherApplyDetail对象", description = "老师入驻申请信息")
 public class TeacherApplyDetail implements Serializable {
     /**
@@ -70,4 +68,76 @@ public class TeacherApplyDetail implements Serializable {
     @ApiModelProperty("教师资格证 ")
     @TableField(value = "teacher__certificate_")
     private String teacherCertificate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
+    public String getGraduateSchool() {
+        return graduateSchool;
+    }
+
+    public void setGraduateSchool(String graduateSchool) {
+        this.graduateSchool = graduateSchool;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getGradCertificate() {
+        return gradCertificate;
+    }
+
+    public void setGradCertificate(String gradCertificate) {
+        this.gradCertificate = gradCertificate;
+    }
+
+    public String getDegreeCertificate() {
+        return degreeCertificate;
+    }
+
+    public void setDegreeCertificate(String degreeCertificate) {
+        this.degreeCertificate = degreeCertificate;
+    }
+
+    public String getTeacherCertificate() {
+        return teacherCertificate;
+    }
+
+    public void setTeacherCertificate(String teacherCertificate) {
+        this.teacherCertificate = teacherCertificate;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherAuthEntryRecordVo.java

@@ -6,15 +6,11 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 /**
  * @Author: liweifan
  * @Data: 2022/3/21 13:34
  */
-@Data
-@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "TeacherAuthEntryRecordVo对象", description = "老师入驻审核详情")
 public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
 
@@ -35,4 +31,52 @@ public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
 
     @ApiModelProperty("审核人 ")
     private String verifyUser;
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getIdCardNo() {
+        return idCardNo;
+    }
+
+    public void setIdCardNo(String idCardNo) {
+        this.idCardNo = idCardNo;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getVerifyUser() {
+        return verifyUser;
+    }
+
+    public void setVerifyUser(String verifyUser) {
+        this.verifyUser = verifyUser;
+    }
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -108,4 +108,6 @@
       </foreach>
     </select>
 
+
+
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthEntryRecordMapper.xml

@@ -64,7 +64,28 @@
             u.phone_ as phone
         FROM teacher_auth_entry_record t
         left join sys_user u on t.user_id_ = u.id_
-        where
+        left join sys_user v on t.verify_user_id_ = u.id_
+        <where>
+            <if test="null != param.search and '' != param.search">
+                AND (
+                    t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or
+                    u.username_ LIKE CONCAT('%', #{param.search}, '%') or
+                    u.phone_ LIKE CONCAT('%', #{param.search}, '%')
+                )
+            </if>
+            <if test="null != param.verifyUser and '' != param.verifyUser">
+                AND v.username_ LIKE CONCAT('%', #{param.verifyUser}, '%')
+            </if>
+            <if test="param.startTime !=null">
+                <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
+            </if>
+            <if test="param.endTime !=null">
+                <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+            </if>
+            <if test="param.teacherAuthStatus !=null">
+                AND t.teacher_auth_status_ = #{param.teacherAuthStatus}
+            </if>
+        </where>
     </select>
 
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo">

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/OrderController.java

@@ -11,7 +11,6 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import com.yonge.cooleshow.biz.dal.entity.Order;
 import com.yonge.cooleshow.biz.dal.service.OrderService;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping("/Order")
 @Api(value = "平台订单表", tags = "平台订单表")
 public class OrderController extends BaseController {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/OrderDetailController.java

@@ -11,7 +11,6 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import com.yonge.cooleshow.biz.dal.entity.OrderDetail;
 import com.yonge.cooleshow.biz.dal.service.OrderDetailService;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping("/OrderDetail")
 @Api(value = "平台订单表", tags = "平台订单表")
 public class OrderDetailController extends BaseController {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/OrderRefundsController.java

@@ -11,7 +11,6 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import com.yonge.cooleshow.biz.dal.entity.OrderRefunds;
 import com.yonge.cooleshow.biz.dal.service.OrderRefundsService;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping("/OrderRefunds")
 @Api(value = "用户退款表", tags = "用户退款表")
 public class OrderRefundsController extends BaseController {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SubjectController.java

@@ -39,4 +39,15 @@ public class SubjectController extends BaseController {
 	public Object queryPageTree(SubjectQueryInfo queryInfo) {
 		return succeed(subjectService.queryPageTree(queryInfo));
 	}
+
+/***
+     * 获取科目
+     * @author liweifan
+     * @updateTime 2022/3/21 17:21
+     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.util.List<com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo>>
+     */
+    public HttpResponseResult<List<SubjectSelectVo>> subjectSelect(){
+        List<SubjectSelectVo> subjectSelect = subjectService.subjectSelect();
+        return succeed(subjectSelect);
+    }
 }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherAuthEntryRecordController.java

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.AuthOperaDto;
 import com.yonge.cooleshow.biz.dal.dto.RealnameAuthDto;
 import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherAuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.support.Condition;
 import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
@@ -22,15 +23,14 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
 
+import javax.validation.Valid;
+
 @RestController
-@AllArgsConstructor
 @RequestMapping("/TeacherAuthEntryRecord")
 @Api(value = "老师入驻审核表", tags = "老师入驻审核表")
 public class TeacherAuthEntryRecordController extends BaseController {
@@ -44,7 +44,7 @@ public class TeacherAuthEntryRecordController extends BaseController {
     @PostMapping("/realnameAuth")
     @ApiOperation(value = "实名认证", notes = "传入realnameAuthDto")
     @ResponseBody
-    public HttpResponseResult<IdcardInfoExtractor> realnameAuth(@RequestBody RealnameAuthDto realnameAuthDto) {
+    public HttpResponseResult<IdcardInfoExtractor> realnameAuth(@Valid @RequestBody RealnameAuthDto realnameAuthDto) {
         IdcardValidator idcardValidator = new IdcardValidator();
         //验证身份证号合法性
         boolean validatedAllIdcard = idcardValidator.isValidatedAllIdcard(realnameAuthDto.getIdcardNo());
@@ -63,7 +63,7 @@ public class TeacherAuthEntryRecordController extends BaseController {
 
     @PostMapping("/doApply")
     @ApiOperation(value = "提交申请", notes = "传入teacherAuthEntryRecord")
-    public HttpResponseResult<Boolean> doApply(TeacherApplyDetailDto teacherApplyDetailDto) throws Exception{
+    public HttpResponseResult<Boolean> doApply(@Valid @RequestBody TeacherApplyDetailDto teacherApplyDetailDto) throws Exception{
         SysUser sysUser = sysUserFeignService.queryUserInfo();
 		//处理老师申请逻辑
         return teacherAuthEntryRecordService.doApply(teacherApplyDetailDto, sysUser);
@@ -74,8 +74,8 @@ public class TeacherAuthEntryRecordController extends BaseController {
      */
     @GetMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入teacherAuthEntryRecord")
-    public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(TeacherAuthEntryRecord teacherAuthEntryRecord, Query query) {
-        IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(Condition.getPage(query), teacherAuthEntryRecord);
+    public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(TeacherAuthEntryRecordSearch search, Query query) {
+        IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(Condition.getPage(query), search);
         return succeed(Condition.pageInfo(pages));
     }
 
@@ -92,7 +92,7 @@ public class TeacherAuthEntryRecordController extends BaseController {
 
     @PostMapping("/doAuth")
     @ApiOperation(value = "审核", notes = "传入authOperaDto")
-    public HttpResponseResult<Boolean> doAuth(AuthOperaDto authOperaDto) throws Exception{
+    public HttpResponseResult<Boolean> doAuth(@Valid AuthOperaDto authOperaDto) throws Exception{
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         return teacherAuthEntryRecordService.doAuth(authOperaDto, sysUser);
     }
@@ -108,4 +108,6 @@ public class TeacherAuthEntryRecordController extends BaseController {
         }
         return status(teacherAuthEntryRecordService.removeByIds(StringUtil.toLongList(ids)));
     }
+
+
 }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherAuthMusicianRecordController.java

@@ -11,7 +11,6 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
 import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping("/TeacherAuthMusicianRecord")
 @Api(value = "老师音乐人审核表", tags = "老师音乐人审核表")
 public class TeacherAuthMusicianRecordController extends BaseController {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherController.java

@@ -8,8 +8,6 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-import lombok.AllArgsConstructor;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -33,17 +31,16 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.utils.string.StringUtil;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping("/Teacher")
 @Api(value = "教师表", tags = "教师表")
 public class TeacherController extends BaseController {
 
     @Autowired
     private TeacherService teacherService;
-    
+
     @Autowired
     private SysUserFeignService sysUserFeignService;
-    
+
     @Autowired
     private SubjectDao subjectDao;
 
@@ -55,7 +52,7 @@ public class TeacherController extends BaseController {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 		Teacher teacher = teacherService.getById(user.getId());
-        
+
 		return succeed(teacher);
     }
 

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherWithdrawalController.java

@@ -11,7 +11,6 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import com.yonge.cooleshow.biz.dal.entity.TeacherWithdrawal;
 import com.yonge.cooleshow.biz.dal.service.TeacherWithdrawalService;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping("/TeacherWithdrawal")
 @Api(value = "老师账户提现表", tags = "老师账户提现表")
 public class TeacherWithdrawalController extends BaseController {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountController.java

@@ -11,7 +11,6 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import com.yonge.cooleshow.biz.dal.entity.UserAccount;
 import com.yonge.cooleshow.biz.dal.service.UserAccountService;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping("/UserAccount")
 @Api(value = "老师账户表", tags = "老师账户表")
 public class UserAccountController extends BaseController {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountRecordController.java

@@ -11,7 +11,6 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import com.yonge.cooleshow.biz.dal.entity.UserAccountRecord;
 import com.yonge.cooleshow.biz.dal.service.UserAccountRecordService;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping("/UserAccountRecord")
 @Api(value = "老师账户流水表", tags = "老师账户流水表")
 public class UserAccountRecordController extends BaseController {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserBankCardController.java

@@ -11,7 +11,6 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import com.yonge.cooleshow.biz.dal.entity.UserBankCard;
 import com.yonge.cooleshow.biz.dal.service.UserBankCardService;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping("/UserBankCard")
 @Api(value = "老师绑卡记录表", tags = "老师绑卡记录表")
 public class UserBankCardController extends BaseController {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/VipCardController.java

@@ -11,7 +11,6 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,7 +20,6 @@ import com.yonge.cooleshow.biz.dal.entity.VipCard;
 import com.yonge.cooleshow.biz.dal.service.VipCardService;
 
 @RestController
-@AllArgsConstructor
 @RequestMapping("/VipCard")
 @Api(value = "会员卡表", tags = "会员卡表")
 public class VipCardController extends BaseController {