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

# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

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

@@ -155,6 +155,8 @@ public class SarStandardsInfo extends BaseEntity {
     @TableField(exist = false)
     private String standNatureShow; // 标准性质显示名称
     @TableField(exist = false)
+    private String standTextStatusShow; // 标准文本状态显示名称
+    @TableField(exist = false)
     private String sychronId; // 同步数据ID
     @TableField(exist = false)
     private List<DicTypeEO> dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据
@@ -607,5 +609,13 @@ public class SarStandardsInfo extends BaseEntity {
     public void setStandSystemName(String standSystemName) {
         this.standSystemName = standSystemName;
     }
+
+    public String getStandTextStatusShow() {
+        return standTextStatusShow;
+    }
+
+    public void setStandTextStatusShow(String standTextStatusShow) {
+        this.standTextStatusShow = standTextStatusShow;
+    }
 }