Merge branch 'develop_master' into develop_3

# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarCompResAssess/SarCompResAssessMapper.xml

adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationForeignStandardMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationForeignStandardDao">
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarInterpretationStandard/SarInterpretationNationalStandardMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarInterpretationStandard.dao.SarInterpretationNationalStandardDao">
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarMenu/SarMenuMapper.xml

@@ -221,7 +221,7 @@
 
     <!--    根据目录类型查询最外一层节点 -->
     <select id="queryMenuByDis" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarMenu.entity.SarMenu">
-        select <include refid="Base_Column_List"/> from SAR_MENU
+        select <include refid="Base_Column_List"/> from sar_menu
         where valid_flag = 0
         and (parent_id is null or parent_id='1')
         <if test='sorDivide != null and sorDivide != "ALL_STAND"' >

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceProductAssess/SarStandardComplianceProductAssessMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.sarStandardComplianceProductAssess.dao.SarStandardComplianceProductAssessDao">
+
+</mapper>