Merge branch 'music_score' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ClientTypeEnum.java

@@ -3,7 +3,7 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum ClientTypeEnum implements BaseEnum<String, ClientTypeEnum> {
-	NETWORK_ROOM("NETWORK_ROOM", "网络教师"), SMART_PRACTICE("SMART_PRACTICE", "智能陪练");
+	NETWORK_ROOM("NETWORK_ROOM", "网络教室"), SMART_PRACTICE("SMART_PRACTICE", "智能陪练");
 
 	private String code;
 

mec-web/src/main/java/com/ym/mec/web/controller/SysMusicScoreAccompanimentController.java

@@ -40,9 +40,6 @@ public class SysMusicScoreAccompanimentController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScoreAccompaniment/queryPage')")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
-        if(queryInfo.getClientType() == null){
-            queryInfo.setClientType(ClientTypeEnum.NETWORK_ROOM);
-        }
         return succeed(sysMusicScoreAccompanimentService.queryAll(queryInfo));
     }