Merge branch 'maintenance_feature' into test

# Conflicts:
#	mec-student/src/main/java/com/ym/mec/student/config/ResourceServerConfig.java

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -4,6 +4,7 @@ package com.ym.mec.web.controller.education;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dao.StudentInstrumentDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
@@ -51,6 +52,8 @@ public class EduRepairController extends BaseController {
     private StudentGoodsSellService studentGoodsSellService;
     @Autowired
     private StudentInstrumentService studentInstrumentService;
+    @Autowired
+    private StudentInstrumentDao studentInstrumentDao;
 
     @ApiOperation("获取学生列表")
     @GetMapping(value = "/getStudents")
@@ -208,6 +211,7 @@ public class EduRepairController extends BaseController {
     @ApiOperation(value = "获取乐器与乐保列表")
     @GetMapping("/getInstrumentList")
     public HttpResponseResult<PageInfo<StudentInstrument>> getInstrumentList(StudentInstrumentQueryInfo queryInfo) {
+        studentInstrumentDao.batchUpdate();
         return succeed(studentInstrumentService.queryPage(queryInfo));
     }
 }