Merge branch 'Regulation' of http://git.izouma.com/licailing/wenlvju into Regulation

src/main/java/com/izouma/wenlvju/domain/Record.java

@@ -79,6 +79,8 @@ public class Record extends BaseEntity {
     @ApiModelProperty(value = "考试简章")
     private String examinationGuide;
 
+    private String remark;
+
 //    @ApiModelProperty(value = "监管人员")
 //    private Long supervisorUserId;
 

src/main/java/com/izouma/wenlvju/domain/regulation/RecordExpertAudit.java

@@ -3,6 +3,7 @@ package com.izouma.wenlvju.domain.regulation;
 import com.izouma.wenlvju.converter.StringArrayConverter;
 import com.izouma.wenlvju.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -33,5 +34,6 @@ public class RecordExpertAudit extends BaseEntity {
     @Convert(converter = StringArrayConverter.class)
     private List<String> img;
 
+    @ApiModelProperty("检查人")
     private String supervisor;
 }

src/main/java/com/izouma/wenlvju/web/regulation/RecordExpertAuditController.java

@@ -1,6 +1,5 @@
 package com.izouma.wenlvju.web.regulation;
 
-import com.alibaba.fastjson.JSONObject;
 import com.izouma.wenlvju.domain.regulation.RecordExpertAudit;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
@@ -63,8 +62,8 @@ public class RecordExpertAuditController extends BaseController {
 
     @PreAuthorize("hasAnyRole('ADMIN','DISTRICT','DISTRICT_STAFF','EXPERT')")
     @PostMapping("/batchSave")
-    public void batchSave(String audits) {
-        List<RecordExpertAudit> recordExpertAudits = JSONObject.parseArray(audits, RecordExpertAudit.class);
+    public void batchSave(@RequestBody List<RecordExpertAudit> recordExpertAudits) {
+//        List<RecordExpertAudit> recordExpertAudits = JSONObject.parseArray(audits, RecordExpertAudit.class);
         recordExpertAuditService.batchSave(recordExpertAudits);
     }
 }