Merge remote-tracking branch 'origin/2021-04-28' into 2021-04-28

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

@@ -114,9 +114,7 @@
             <if test="currentClass != null">
                 current_class_=#{currentClass},
             </if>
-            <if test="cooperationOrganId != null">
                 cooperation_organ_id_=#{cooperationOrganId},
-            </if>
                 update_time_ = NOW()
         </set>
         WHERE user_id_ = #{userId}