Merge branch 'test' into 'master'

会议申报

See merge request spfm-group/spfm-market-front!39

src/pages/main/meetingDeclaration/marketDecisionMeeting.vue

@@ -47,7 +47,7 @@
                     style="width: 100%"
                     v-loading="loading"
                 >
-                    <el-table-column label="会议时间"  align="center"  width="300px" :formatter="dateFormat">
+                    <el-table-column label="会议时间"  align="center"  width="300px" prop="meetingTime" :formatter="dateFormat">
                         <!-- <template slot-scope="scope">
                             <span>{{
                                 $formatDate(scope.row.meetingTime, "YYYY-MM-DD")