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

src/main/java/com/xjrsoft/module/form/controller/FormExecuteController.java

@@ -222,14 +222,14 @@ public class FormExecuteController {
         return R.ok(formExecuteService.workFlowInfo(dto));
     }
 
-    @GetMapping(value = "/export")
-    @ApiOperation(value = "导出")
-    @XjrLog(value = "导出表单数据")
-    public ResponseEntity<byte[]> export(@Valid FormExecuteListDto dto) throws IOException {
-//    @PostMapping(value = "/export")
+//    @GetMapping(value = "/export")
 //    @ApiOperation(value = "导出")
 //    @XjrLog(value = "导出表单数据")
-//    public ResponseEntity<byte[]> export(@Valid @RequestBody FormExecuteListDto dto) throws IOException {
+//    public ResponseEntity<byte[]> export(@Valid FormExecuteListDto dto) throws IOException {
+    @PostMapping(value = "/export")
+    @ApiOperation(value = "导出")
+    @XjrLog(value = "导出表单数据")
+    public ResponseEntity<byte[]> export(@Valid @RequestBody FormExecuteListDto dto) throws IOException {
         FormRelease formRelease = formReleaseService.getById(dto.getReleaseId());
         FormReleaseConfig formReleaseConfig = JSONUtil.toBean(formRelease.getConfigJson(), FormReleaseConfig.class);
         // 配置excel第一行字段名