Merge branch 'message' of licailing/wenlvju into master

src/main/java/com/izouma/wenlvju/dto/ProgrammeDTO.java

@@ -58,7 +58,7 @@ public class ProgrammeDTO {
     @ExcelProperty(value = "指导老师")
     private String instructor;
 
-    @ApiModelProperty(value = "指导老师电话")
+    @ExcelProperty(value = "指导老师电话")
     private String instructorPhone;
 
     @ExcelProperty(value = "考级机构")

src/main/java/com/izouma/wenlvju/web/performance/ProgrammeController.java

@@ -92,7 +92,7 @@ public class ProgrammeController extends BaseController {
     @GetMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<ProgrammeDTO> data = programmeService.toDTOList(all(pageQuery).getContent());
+        List<ProgrammeDTO> data = programmeService.toDTOList(programmeService.all2(pageQuery).getContent());
         ExcelUtils.export(response, data);
     }
 

src/main/vue/src/views/performance/ProgrammeList.vue

@@ -643,7 +643,7 @@ export default {
 
             let data = {
                 sort: 'programmeStatus,desc',
-                size: 1000,
+                size: 10000,
                 query: {}
             };
             if (this.form.competitionGroup) {