Merge remote-tracking branch 'origin/test' into test

application/index/view/houses/edit.html

@@ -560,7 +560,7 @@
 										<textarea class="form-control textarea-500-width" rows="3" id="traffic" data-alert="请填写交通内容！"></textarea>
 									</div>
 									<div class="form-group full-width-100">
-										<label for="">已入住</label>
+										<label for="">已入驻</label>
 										<textarea class="form-control textarea-500-width" rows="3" id="hasMoved" data-alert="请填写已入住内容！"></textarea>
 									</div>
 								</li>