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

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionViewMapper.xml

@@ -344,13 +344,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             a.join_instation_time joinInstationTime,
             a.address,
-            b.dict_label componentLabel,
+            a.component as componentLabel,
             a.weight
         FROM
             centerdata_t_housingconstruction_gassource a
-            left join ${database_system}.sys_dict_data b on a.component = b.dict_value
             left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
-        where b.dict_type = 'housingconstruction_component'
+        where
         <if test="enterpriseId != null  and enterpriseId != ''"> and a.enterprise_id = #{enterpriseId}</if>
         ${params.dataScope}
     </select>