Merge remote-tracking branch 'origin/master'

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

@@ -31,9 +31,19 @@ public class MyFollow extends BaseEntity {
 
     @ApiModelProperty("音乐人(0:否 1:是)")
     private Integer musicianFlag;
+    @ApiModelProperty("老师入驻(0:否 1:是)")
+    private Integer entryFlag;
     @ApiModelProperty("专业技能")
     private String subjectName;
 
+    public Integer getEntryFlag() {
+        return entryFlag;
+    }
+
+    public void setEntryFlag(Integer entryFlag) {
+        this.entryFlag = entryFlag;
+    }
+
     public String getUserId() {
         return userId;
     }

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

@@ -129,6 +129,7 @@
             t.exp_time_ AS expTime,
 
             tr.musician_flag_ AS musicianFlag,
+            tr.entry_flag_ AS entryFlag,
             (SELECT group_concat(name_) FROM `subject` WHERE find_in_set(id_,tr.subject_id_)) AS subjectName
         FROM student_star s
         LEFT JOIN sys_user u ON s.teacher_id_ = u.id_