Merge branch 'dev_1_2_20220802'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityEvaluationController.java

@@ -96,6 +96,7 @@ public class ActivityEvaluationController extends BaseController {
 		}
 		query.setAuditStatus(AuthStatusEnum.PASS);
 		query.setState(YesOrNoEnum.YES);
+		query.setAuditVersion(YesOrNoEnum.NO);
 
 		IPage<MusicSheetVo> musicSheetVoIPage = activityEvaluationService.musicPage(PageUtil.getPage(query), query);
 		return succeed(PageUtil.pageInfo(musicSheetVoIPage));

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

@@ -31,6 +31,17 @@ public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
     @ApiModelProperty("审核人 ")
     private String verifyUser;
 
+    @ApiModelProperty("用户名")
+    private String username;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
     public String getRealName() {
         return realName;
     }

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

@@ -43,6 +43,7 @@
             ifnull(u.real_name_,u.username_) as realName,
             u.id_card_no_ as idCardNo,
             u.phone_ as phone,
+            u.username_ as username,
             u.gender_ as gender,
             v.username_ as verifyUser,
             (
@@ -82,6 +83,7 @@
             ifnull(u.real_name_,u.username_) as realName,
 			u.id_card_no_ as idCardNo,
 			u.phone_ as phone,
+            u.username_ as username,
 			u.gender_ as gender,
 			(
                 SELECT GROUP_CONCAT(name_ ORDER by locate(id_,t.subject_id_)) FROM subject WHERE FIND_IN_SET(id_,t.subject_id_)