Merge branch 'master' of http://192.168.2.241:3000/wangzhun/gisbim into fac-master

sxgk-projet/sxgk/src/main/java/com/tofly/sxgk/entity/Areacompany.java

@@ -96,5 +96,8 @@ public class Areacompany extends Model<Areacompany> {
     private boolean needSpv;
     @ApiModelProperty(value = "是否需要照片")
     private boolean needPhoto;
+
+    @ApiModelProperty(value = "工作空间")
+    private String workSpace;
             
 }

sxgk-projet/sxgk/src/main/resources/mapper/AreacompanyMapper.xml

@@ -3,21 +3,22 @@
 
 <mapper namespace="com.tofly.sxgk.mapper.AreacompanyMapper">
 
-  <resultMap id="areacompanyMap" type="com.tofly.sxgk.entity.Areacompany">
-                <id property="id" column="ID"/>
-           <result property="name" column="NAME"/>
-                      <result property="code" column="CODE"/>
-                      <result property="createTime" column="CREATE_TIME"/>
-      <result property="unit" column="UNIT"/>
-      <result property="gcfw" column="GCFW"/>
-      <result property="xmtz" column="XMTZ"/>
-      <result property="xmzq" column="XMZQ"/>
-      <result property="xmjs" column="XMJS"/>
-      <result property="needPhoto" column="need_photo"/>
-      <result property="needSpv" column="need_spv"/>
-      <result property="dataUser" column="DATA_USER"/>
-      <result property="geo_info" column="GEO_INFO"/>
+    <resultMap id="areacompanyMap" type="com.tofly.sxgk.entity.Areacompany">
+        <id property="id" column="ID"/>
+        <result property="name" column="NAME"/>
+        <result property="code" column="CODE"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="unit" column="UNIT"/>
+        <result property="gcfw" column="GCFW"/>
+        <result property="xmtz" column="XMTZ"/>
+        <result property="xmzq" column="XMZQ"/>
+        <result property="xmjs" column="XMJS"/>
+        <result property="needPhoto" column="need_photo"/>
+        <result property="needSpv" column="need_spv"/>
+        <result property="dataUser" column="DATA_USER"/>
+        <result property="geo_info" column="GEO_INFO"/>
+        <result property="workSpace" column="WORK_SPACE"/>
 
-  </resultMap>
+    </resultMap>
 
 </mapper>