Merge remote-tracking branch 'origin/v0.1.0' into v0.1.0

src/views/menu/visitRecord/index.vue

@@ -41,7 +41,7 @@
                     已失效
                   </span>
                 <van-button v-if="v.approveStatus==0" @click.stop="cancelOutInRequest(v.id)" type="info" size="mini">取消出入申请</van-button>
-                <van-button v-if="v.approveStatus==1 && v.status!=3 &&!v.arrivalTime" type="info" size="mini">登记达到时间</van-button>
+                <van-button v-if="v.approveStatus==1 && v.status!=3 &&!v.arrivalTime" type="info" size="mini">登记进入时间</van-button>
                 <van-button v-if="v.approveStatus==1 && v.status!=3 && v.arrivalTime&&!v.departureTime" type="info" size="mini">登记离开时间</van-button>
               </template>
             </van-cell>