Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/views/home.vue

@@ -41,7 +41,7 @@
                       style="width: 100%">
                       <el-table-column prop="planName" label="随访计划名称" align="center"></el-table-column>
                       <el-table-column prop="appointTime" label="随访计划时间" align="center"></el-table-column>
-                      <el-table-column prop="hasAppointed" label="已经预约" align="center"></el-table-column>
+                      <el-table-column prop="appointedCount" label="已经预约" align="center"></el-table-column>
                       <el-table-column prop="notAppointedCount" label="未预约" align="center"></el-table-column>
                       <el-table-column prop="content" label="操作" align="center">
                         <template slot-scope="scope">