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

mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -1400,7 +1400,7 @@
                     and s.membership_end_time_ > now()
                 </if>
                 <if test="0 == hasMember">
-                    and (s.membership_end_time_ is null or t.membership_end_time_ &lt;= now())
+                    and (s.membership_end_time_ is null or s.membership_end_time_ &lt;= now())
                 </if>
             </if>
         </where>