Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-service/src/main/resources/mapper/TabStoreFieldMapper.xml

@@ -34,7 +34,7 @@
   </sql>
   <sql id="Base_Column_List_Enterprise">
     a.store_field_id, a.store_field_name, a.store_field_code, a.store_field_type, b.enterprise_id,
-    a.status, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.own_type
+    a.status, a.create_time, a.update_time, a.store_field_detail, a.erp_rel_code, a.sort, b.own_type,c.region_id
   </sql>
   <sql id="Base_Column_List_Region">
     a.store_field_id, a.store_field_name, a.store_field_code, a.store_field_type, b.region_id,
@@ -238,7 +238,10 @@
     from tab_store_field a
     left join tab_store_field_rel b
     on a.store_field_id = b.store_field_id
+    left join tab_store_field_region_rel c
+    on b.store_field_id = c.store_field_id
     and b.status = 1
+    and c.status=1
     where a.status = 1
     <if test="enterpriseId != null ">
       and b.enterprise_id = #{enterpriseId}