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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandardsInfo.entity;
 
 import com.adc.da.sys.common.BasePage;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.List;
@@ -173,6 +174,16 @@ public class SarBussionessStandEOPage extends BasePage {
     private String exportAllAttrInfo;
     private String exportAllResult;
 
+    private String syncParam;
+
+    public String getSyncParam() {
+        return syncParam;
+    }
+
+    public void setSyncParam(String syncParam) {
+        this.syncParam = syncParam;
+    }
+
     public String getExportAllResult() {
         return exportAllResult;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java

@@ -91,6 +91,9 @@ public class SarStandardsInfoEOPage extends BasePage {
     private String orderBy1 = "SAR_STANDARDS_INFO.issue_time";
     private String order1 = "";
 
+    // syncParam == sync
+    private String syncParam;
+
     /**
      *     zhaokaiyao
      *     文本状态