Merge branch 'master' of http://47.102.110.240:3000/yuxiangpei/jzlife_crm_html

src/views/config/shop.vue

@@ -24,7 +24,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" label="城市" prop="shopCity" />
+      <el-table-column align="center" label="城市" prop="sysCity.cityName" />
       <el-table-column align="center" label="状态" prop="deleted">
         <template slot-scope="scope">
           <span v-if="scope.row.deleted == true">已停用</span>