Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

# Conflicts:
#	src/pages/building/list/add/components/imageSet.jsx

src/pages/building/list/add/components/imageSet.jsx

@@ -122,10 +122,10 @@ function imageSet(props) {
       render: (buildingArea, _) => <span>{ `${buildingArea}m²` }</span>,
     },
     {
-      title: '套内面积2',
+      title: '套内面积',
       dataIndex: 'insideArea',
       key: 'insideArea',
-      render: (insideArea, _) => <span>{ `${insideArea === null ? "-" : insideArea + "m²"}` }</span>,
+      render: (insideArea, _) => <span>{ `${insideArea === 0 || insideArea === null ? "-" : insideArea + "m²"}` }</span>,
     },
     {
       title: '创建时间',