Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature

src/views/modules/volunteer/LifeCircleManagement/info.vue

@@ -24,8 +24,8 @@
                                 :disabled="showdisabled" class="u-item-width-normal"></el-input> -->
                                 <div>{{ formData.name }}</div>
                         </el-form-item>
-                        <el-form-item label="联系人" prop="linkPhone" label-width="100px">
+                        <el-form-item label="联系人" prop="linkman" label-width="100px">
-                            <div>{{ formData.linkPhone }}</div>
+                            <div>{{ formData.linkman }}</div>
                         </el-form-item>
                         <el-form-item label="联系电话" prop="linkPhone" label-width="100px">
                             <div>{{ formData.linkPhone }}</div>