Merge remote-tracking branch 'origin/main'

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhKhrwResultController.java

@@ -51,7 +51,7 @@ public class KhKhrwResultController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('kaohe:kh_result:generate')")
     @PostMapping("/generateResult")
-    public AjaxResult generateResult(@RequestBody KhPingce pc) {   //传递参数  id、pc_title、bkhdxtype
+    public AjaxResult generateResult(KhPingce pc) {   //传递参数  id、pcTitle、bkhdxtype
         JSONArray header = new JSONArray();//存放表头及表格关联数据
         JSONObject headerData = new JSONObject();
         headerData.put("name", null);
@@ -217,7 +217,6 @@ public class KhKhrwResultController extends BaseController
         pcResult.setTableData(endData.toJSONString());
         khKhrwResultService.insertKhKhrwResult(pcResult);
         return AjaxResult.success();
-
     }
 
     /**