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

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkListDto.java

@@ -33,7 +33,7 @@ public class CourseHomeworkListDto {
     private java.util.Date startClassTime;
 
     /**  */
-    private Integer musicGroupId;
+    private String musicGroupId;
 
     @ApiModelProperty(value = "乐团名称",required = false)
     private String musicGroupName;
@@ -110,11 +110,11 @@ public class CourseHomeworkListDto {
         this.startClassTime = startClassTime;
     }
 
-    public Integer getMusicGroupId() {
+    public String getMusicGroupId() {
         return musicGroupId;
     }
 
-    public void setMusicGroupId(Integer musicGroupId) {
+    public void setMusicGroupId(String musicGroupId) {
         this.musicGroupId = musicGroupId;
     }
 

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

@@ -163,6 +163,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			message.setTitle(messageConfig.getDescription());
 			message.setReadStatus(0);
 			message.setMemo(memo);
+			message.setGroup(messageConfig.getGroup());
 			messages.add(message);
 		}
 		sysMessageDao.batchInsert(messages);

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

@@ -211,7 +211,7 @@ public class CourseScheduleController extends BaseController {
     
     @ApiOperation(value = "查询课程投诉详情")
 	@GetMapping("/queryCourseScheduleComplaintsDetail")
-    @PreAuthorize("@pcs.hasPermissions('course/queryCourseScheduleComplaintsDetail')")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/queryCourseScheduleComplaintsDetail')")
     public Object queryCourseScheduleComplaintsDetail(Long courseScheduleComplaintsId){
     	CourseScheduleComplaints complaints = courseScheduleComplaintsService.get(courseScheduleComplaintsId);
     	if(complaints == null){