Merge branch '20220914' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -22,6 +22,7 @@ import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.common.page.PageUtil;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -238,6 +239,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
                 throw new BizException("入职日期不可晚于转正日期");
             }
         }
+        BeanUtils.copyProperties(user, teacher);
         teacher.setUpdateTime(new Date());
         teacher.setTeacherOrganId(teacher.getOrganId());
         teacherDao.eduUpdateTeacher(teacher);

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

@@ -549,7 +549,8 @@
             su.username_ nickName,
             su.real_name_ userName,
             su.gender_ gender,
-            su.phone_ phone
+            su.phone_ phone,
+            su.avatar_ avatar
         FROM sys_user su
         <where>
                 su.id_ IN