Merge remote-tracking branch 'origin/master'

sms_water/src/main/resources/mapper/AlarmSettingMapper.xml

@@ -7,7 +7,7 @@
         <result property="companyOrgId" column="company_org_id" jdbcType="INTEGER"/>
         <result property="deptOrgId" column="dept_org_id" jdbcType="INTEGER"/>
         <result property="sceneId" column="scene_id" jdbcType="INTEGER"/>
-        <result property="sceneName" column="scene_name" jdbcType="VARCHAR"/>
+        <result property="sceneName" column="scene_name1" jdbcType="VARCHAR"/>
         <result property="deviceId" column="device_id" jdbcType="INTEGER"/>
         <result property="deviceName" column="device_name" jdbcType="VARCHAR"/>
         <result property="deviceType" column="device_type" jdbcType="VARCHAR"/>
@@ -26,7 +26,7 @@
 
     <!-- 基本字段 -->
     <sql id="Base_Column_List">
-         t1.*,t2.company_org_id,t2.dept_org_id,t2.scene_id,t3.scene_name,t2.device_name,t2.device_type_id,t5.device_type,t4.name attribute_name
+         t1.*,t2.company_org_id,t2.dept_org_id,t3.scene_name scene_name1,t2.device_name,t2.device_type_id,t5.device_type,t4.name attribute_name
      </sql>
 
     <!-- 外联表  -->