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

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

@@ -147,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getEnterpriseList" parameterType="CenterdataTHousingconstructionEnterprise" resultType="map">
         SELECT
+            id enterpriseId,
             enterprise_name enterpriseName,
             enterprise_administrative_area enterpriseAdministrativeArea,
             legal_representative legalRepresentative,

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

@@ -125,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getRealnameuserList" parameterType="CenterdataTHousingconstructionRealnameuser" resultType="map">
         SELECT
+        a.enterprise_id enterpriseId,
         enterprise_user_type enterpriseUserType,
         b.dict_label enterpriseUserTypeLabel,
         user_code userCode,

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

@@ -319,6 +319,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getSteelcylinderPointList" parameterType="CenterdataTHousingconstructionSteelcylinder" resultType="map">
         SELECT
             a.`name`,
+            a.enterprise_id enterpriseId,
             a.steelcylinder_number steelcylinderNumber,
             z.dict_label standardsLabel,
             a.enterprise_name enterpriseName,