Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js

@@ -100,7 +100,7 @@ export default {
   },
   createPdf: function(data) {
     return request({
-      url: '/scm/v1/scmspecialrebatecheckapply/createPdf ',
+      url: '/scm/v1/scmspecialrebatecheckapply/createPdf',
       method: 'post',
       params: data
     })

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java

@@ -43,6 +43,12 @@ public class OaForm extends BaseEntity {
     private String createOrgSid;
     @ApiModelProperty("创建组织")
     private String createOrgName;
+    @ApiModelProperty("图片，冗余字段")
+    private String imgs;
+    @ApiModelProperty("附件，冗余字段")
+    private String appendixs;
+    @ApiModelProperty("关联审批单")
+    private String linkFormSids;
 
 
 }