Merge branch 'feature/1219_opt' of http://git.dayaedu.com/yonge/cooleshow into develop-new

# Conflicts:
#	cooleshow-app/src/main/java/com/yonge/cooleshow/student/task/TaskController.java

cooleshow-app/src/main/java/com/yonge/cooleshow/student/task/TaskController.java

@@ -59,10 +59,10 @@ public class TaskController extends BaseController {
      */
     @GetMapping("/halfHourTask")
     public HttpResponseResult<Boolean> halfHourTask() {
-        //会员卡到期提醒
         // 并发执行锁
         DistributedLock.of(redissonClient).runIfLockCanGet("halfHourTask", () -> {
             try {
+                //会员卡到期提醒
                 vipCardRecordService.pollExpireMsg();
                 //畅学卡到期提醒
                 discountCardRecordService.pollExpireMsg();

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherHomeController.java

@@ -1,12 +1,9 @@
 package com.yonge.cooleshow.teacher.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.yonge.cooleshow.biz.dal.dto.excel.UserWithdrawalExport;
-import com.yonge.cooleshow.biz.dal.dto.search.TeacherWithdrawalSearch;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.PianoRoomTimeVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherHomeStatisticalVo;
-import com.yonge.cooleshow.biz.dal.vo.UserWithdrawalVo;
 import com.yonge.cooleshow.biz.dal.wrapper.TeacherIndexWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherHomeWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -16,13 +13,10 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.toolset.utils.easyexcel.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/HomeServiceImpl.java

@@ -49,8 +49,6 @@ public class HomeServiceImpl implements HomeService {
     @Resource
     private CourseScheduleService courseScheduleService;
     @Resource
-    private CourseGroupService courseGroupService;
-    @Resource
     private MusicSheetService musicSheetService;
     @Resource
     private UserAccountRecordDao userAccountRecordDao;