Merge branch 'master-charge' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front into master-charge

src/views/training/models/meeting-special-list.vue

@@ -28,10 +28,10 @@
             <vxe-column type="seq" width="60" title="序号" align="center" />
             <vxe-column title="姓名" field="name" min-width="100" :formatter="colNoData" />
             <!-- <vxe-column title="职务" field="position" min-width="100" :formatter="colNoData" /> -->
-            <vxe-column title="手机号" field="contact" min-width="100" :formatter="colNoData" />
-            <vxe-column title="参会费用" field="joinFee" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'">
+            <vxe-column title="手机号" field="phone" min-width="100" :formatter="colNoData" />
+            <vxe-column title="参会费用" field="fee" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'">
                 <template #default="{ row }">
-                    <div class="f-w-5">{{ row?.joinFee }}</div>
+                    <div class="f-w-5">{{ row?.fee }}</div>
                 </template>
             </vxe-column>
         </vxe-table>