Merge branch 'develop_3' into 'develop_master'

查询列表添加代替标准号 dtbzh字段

See merge request LiuChao/foton-slrs-system-rest!370

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

@@ -91,6 +91,10 @@ public class SarStandardsInfo extends BaseEntity {
     @TableField("REPLACE_STAND_NUM")
     private String replaceStandNum;
 
+    @ApiModelProperty(value = "代替标准号")
+    @TableField(exist = false)
+    private String dtbzh;
+
     @ApiModelProperty(value = "被代替标准号")
     @TableField("REPLACED_STAND_NUM")
     private String replacedStandNum;

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -30,6 +30,7 @@
         <result column="allPutTime" property="allPutTime" />
         <result column="text_status" property="textStatus" />
         <result column="stand_system" property="standSystem" />
+        <result column="DTBZH" property="dtbzh" />
     </resultMap>
 
     <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo">
@@ -75,6 +76,7 @@
         SAR_STANDARDS_INFO.STAND_SYSTEM,
         SAR_STANDARDS_INFO.IS_RELATE_ACCESS,
         SAR_STAND_ATTR_INFO.CHJL AS CHJL,
+        SAR_STAND_ATTR_INFO.DTBJH AS DTBZH,
         dicstandSort.DIC_TYPE_NAME AS standSortShow,
         dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow,
         (