Merge remote-tracking branch 'origin/master' into master

blade-service/blade-business/src/main/java/org/springblade/business/excel/DatumPointxyExcel.java

@@ -20,8 +20,8 @@ import java.io.Serializable;
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class DatumPointxyExcel extends DatumPointExcel {
-    @ExcelProperty(value = "x坐标（m）", index = 2)
+    @ExcelProperty(value = "x坐标（m）")
     private String x;
-    @ExcelProperty(value = "y坐标（m）", index = 3)
+    @ExcelProperty(value = "y坐标（m）")
     private String y;
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -3263,7 +3263,7 @@ public class ExcelTabController extends BladeController {
         return R.data("成功!");
     }
 
-    @GetMapping("/batchUploadExcelTab")
+    @PostMapping("/batchUploadExcelTab")
     @ApiOperationSupport(order = 39)
     @ApiOperation(value = "批量上传清表", notes = "传入ExcelTabBatchUploadDTO")
     public R<Object> batchUploadExcelTab(@RequestBody ExcelTabBatchUploadDTO dto) throws IOException {