Merge remote-tracking branch 'origin/dev-mysql' into featue/info_text-1120

src/main/webapp/resources/view/usercenter/forstore/account_manager.html

@@ -88,7 +88,7 @@
 		<div class="rt_menu">
 			<span>您的个人信息</span>
 			<span class="fr" >
-				<button ng-if=" !updateState"  ng-click="changeToUpdate(true)">修改</button>
+				<!--<button ng-if=" !updateState"  ng-click="changeToUpdate(true)">修改</button>-->
 				<button ng-if=" updateState"  ng-click="saveUpdate()">保存</button>
 				<button ng-if="updateState" ng-click="changeToUpdate(false)" style="color: #f00">取消</button>
 			</span>