Merge remote-tracking branch 'origin/master'

mec-student/src/main/java/com/ym/mec/student/StudentApplication.java

@@ -26,7 +26,7 @@ import com.ym.mec.common.filters.EmojiEncodingFilter;
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
 @MapperScan("com.ym.mec.biz.dal.dao")
-@ComponentScan(basePackages = "com.ym.mec")
+@ComponentScan(basePackages = {"com.ym.mec", "com.yonge.log"})
 @Configuration
 @EnableSwagger2Doc
 @EnableAsync

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupPaymentCalenderController.java

@@ -86,6 +86,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
             model.put("amount", calenderDetail.getExpectAmount());
             model.put("calenderCourseSettings", calenderCourseSettings);
             model.put("balance",studentRegistration.getBalance());
+            model.put("calender",calender);
             return succeed(model);
         }else if(calender.getStatus() == PaymentCalenderStatusEnum.OVER){
             throw new BizException("缴费已截止,如有问题请联系指导老师");

mec-teacher/src/main/java/com/ym/mec/teacher/TeacherApplication.java

@@ -22,7 +22,7 @@ import com.ym.mec.common.filters.EmojiEncodingFilter;
 @EnableDiscoveryClient
 @EnableFeignClients("com.ym.mec")
 @MapperScan("com.ym.mec.biz.dal.dao")
-@ComponentScan(basePackages = { "com.ym.mec", "org.snaker.engine" })
+@ComponentScan(basePackages = { "com.ym.mec", "org.snaker.engine", "com.yonge.log"})
 @Configuration
 @EnableSwagger2Doc
 @EnableAsync

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ExtracurricularExercisesController.java

@@ -11,6 +11,7 @@ import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.ExtracurricularExercisesService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,7 @@ public class ExtracurricularExercisesController extends BaseController {
 
     @ApiOperation(value = "创建课外训练")
     @PostMapping("/createExtraExercises")
+    @AuditLogAnnotation(operateName = "创建课外训练")
     private HttpResponseResult createExtraExercises(ExtracurricularExercises exercises){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(sysUser)){

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseHomeworkReplyController.java

@@ -10,6 +10,7 @@ import com.ym.mec.biz.service.StudentCourseHomeworkReplyService;
 import com.ym.mec.biz.service.StudentServeService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -51,6 +52,7 @@ public class TeacherCourseHomeworkReplyController extends BaseController {
 
     @ApiOperation(value = "新增回复-公用")
     @PostMapping("/addPublic")
+    @AuditLogAnnotation(operateName = "新增回复-公用")
     public Object addPublic(@RequestBody StudentCourseHomeworkReply studentCourseHomeworkReply) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(user)){