Bläddra i källkod

fix0926发版本合并冲突

Eric 1 år sedan
förälder
incheckning
56e185cc20

+ 0 - 11
cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -94,17 +94,6 @@
     <!-- 分页查询 -->
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherVo">
         SELECT
-            <include refid="baseColumns"/>,
-            if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
-            u.avatar_ as avator,
-            u.username_ as username,
-            u.phone_ as phone,
-            u.real_name_ as realName,
-            (case when t.membership_end_time_ &gt;= now() then 1 else 0 end) isVip,
-<!--            t.tag_ tag,-->
-            u.del_flag_ as delFlag,
-            (case when isnull(u.id_card_no_) then 0 else 1 end) as isReal,
-            (case when isnull(b.user_id_) then 0 else 1 end) as isBank
         <include refid="baseColumns"/>,
         if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
         u.username_ as username,