Merge branch 'dev' into liusw-account-v1.0.10.19

src/main/webapp/resources/view/vendor/modal/updatePassword.html

@@ -11,7 +11,7 @@
 	<div class="modal-body">
 		<div class="row">
 			<label class="col-md-4 col-sm-4 col text-right">用户：</label>
-			<div class="col-md-4 col-sm-4 col">{{::user.userUU}} - {{::user.userName}} </div>
+			<div class="col-md-4 col-sm-4 col">{{::user.userTel}} - {{::user.userName}} </div>
 		</div>
 		<div class="row line" ng-class="{'has-success': checkSuccess, 'has-error': checkFailed}">
 			<label class="col-md-4 col-sm-4 col text-right">原密码：</label>