# Conflicts:
#	sstudy/src/main/java/com/xhkjedu/sstudy/interceptors/RequestInterceptor.java
#	sstudy/src/main/resources/application.properties

区域作业/预习人均用时完善
教师统计-作业概况-作业详情完善

根据课节名称删除回放地址

导入文件过大提示

# Conflicts:
#	sapi/src/main/resources/application.properties
#	sclass/src/main/resources/application.properties
#	sexam/src/main/resources/application.properties
#	sstudy/src/main/resources/application.properties

# Conflicts:
#	sclass/src/main/java/com/xhkjedu/sclass/controller/classroom/ClassroomController.java
#	sclass/src/main/java/com/xhkjedu/sclass/interceptors/HttpServletFilter.java
#	sclass/src/main/java/com/xhkjedu/sclass/interceptors/RequestInterceptor.java
#	sclass/src/main/java/com/xhkjedu/sclass/interceptors/RequestWrapper.java
#	sclass/src/main/java/com/xhkjedu/sclass/interceptors/WebMvcConfg.java
#	sclass/src/main/java/com/xhkjedu/sclass/mapper/classroom/ClassroomMapper.java
#	sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomPaperService.java
#	sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomService.java
#	slog/src/main/java/com/xhkjedu/slog/interceptors/HttpServletFilter.java
#	slog/src/main/java/com/xhkjedu/slog/interceptors/RequestInterceptor.java
#	slog/src/main/java/com/xhkjedu/slog/interceptors/RequestWrapper.java
#	suser/src/main/java/com/xhkjedu/suser/aop/WebControllerAop.java

# Conflicts:
#	sapi/src/main/resources/application.properties
#	slive/src/main/resources/application.properties