Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/webapp/resources/view/vendor/forstore/vendor_index.html

@@ -19,7 +19,7 @@
             <dl>
                 <dt><img src="static/img/vendor/images/user_photo.png" /></dt>
                 <dd>
-                    <span>{{userInfo.userName}}  | <br/><!--<em>账户余额：￥68899.99</em>--></span>
+                    <span ng-bind="userInfo.userName">  | <br/><!--<em>账户余额：￥68899.99</em>--></span>
                     <span ng-bind="vendor.enName || '个人账户'"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
                     <a ui-sref="vendor_account_management" href="#/account/management/">账户设置&nbsp;》</a>
                     <!--<p><img src="static/img/vendor/images/sell_grade.png"/>专有服务：******</p>-->