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

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

src/views/followup/reservation-manage/reservation-list.vue

@@ -110,7 +110,7 @@
         <div class="pagination">
           <el-pagination
             background
-            v-if="reservationList.fuPlanInfoList"
+            v-if="reservationList.enteringDtos"
             @size-change="handleSizeChangePre"
             @current-change="handleCurrentChangePre"
             layout="total, sizes, prev, pager, next, jumper"