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

src/main/webapp/resources/view/admin/store/fragments/enterprise_info.html

@@ -223,8 +223,8 @@
 			<div class="col-md-4" ng-bind="store.auditInfo.representative"></div>
 		</div>
 		<div class="row">
-			<div class="col-md-2">企业简称</div>
-			<div class="col-md-4" ng-bind="store.enterprise.enShortname">优软商城</div>
+		<!--	<div class="col-md-2">企业简称</div>
+			<div class="col-md-4" ng-bind="store.enterprise.enShortname">优软商城</div>-->
 			<div class="col-md-2">信用代码</div>
 			<div class="col-md-4" ng-bind="store.auditInfo.creditCode">231313654541521313</div>
 		</div>

src/main/webapp/resources/view/common/store_header.html

@@ -339,8 +339,8 @@
 							<li ng-if="storeInfo.enterprise.enQQ.length > 0">
 								<span>QQ：</span><span ng-bind="storeInfo.enterprise.enQQ"></span>
 							</li>
-							<li ng-if="storeInfo.enterprise.enAddress.length > 0">
-								<span>地址：</span><span ng-bind="storeInfo.enterprise.enAddress"></span>
+							<li ng-if="storeInfo.enterprise.address.length > 0">
+								<span>地址：</span><span ng-bind="storeInfo.enterprise.address"></span>
 							</li>
 							<!--<li>
 								<span>传真：</span><span ng-bind="storeInfo.enterprise.enFax || '空'"></span>

src/main/webapp/resources/view/store/default/contact.html

@@ -27,7 +27,7 @@
                 <div ng-if="storeInfo.enterprise.enPhone.length > 0">手机：<span ng-bind="storeInfo.enterprise.enPhone"></span></div>
                 <div ng-if="storeInfo.enterprise.enWeixin.length > 0">微信：<span ng-bind="storeInfo.enterprise.enWeixin"></span></div>
                 <div ng-if="storeInfo.enterprise.enQQ.length > 0">QQ：<span ng-bind="storeInfo.enterprise.enQQ"></span></div>
-                <div ng-if="storeInfo.enterprise.enAddress.length >0">地址：<span ng-bind="storeInfo.enterprise.enAddress">深圳市南山区科技园科技南五路英唐大厦一楼</span></div>
+                <div ng-if="storeInfo.enterprise.address.length >0">地址：<span ng-bind="storeInfo.enterprise.address">深圳市南山区科技园科技南五路英唐大厦一楼</span></div>
             </div>
 		</div>
 	</div>

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

@@ -403,7 +403,7 @@
 										</em>
 									</div>
 									<div class="list">地址：
-										<em ng-bind="item.storeInfo.enterprise.enAddress || '暂无地址信息'">1212314531455</em>
+										<em ng-bind="item.storeInfo.enterprise.address || '暂无地址信息'">1212314531455</em>
 									</div>
 								</div>
 							</div>

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

@@ -413,14 +413,14 @@
 				<span>{{enterprise.enName}}</span>
 			</div>
 		</div>
-		<div class="row com_row">
+	<!--	<div class="row com_row">
 			<div class="col-md-2 custom_col">
 				<span>企业简称</span>
 			</div>
 			<div class="col-md-10 custom_col">
 				<span>{{enterprise.enShortname}}</span>
 			</div>
-		</div>
+		</div>-->
 		<!--<div class="row com_row" style="min-height: 40px; max-height: 240px;">
 			<div class="col-md-2 custom_col">
 				<span>营业执照</span>