Merge remote-tracking branch 'origin/feature_release-tomysql' into feature_release-tomysql

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

@@ -695,7 +695,7 @@
 					<span>地&nbsp;&nbsp;&nbsp;&nbsp;址<strong class="text-inverse">*</strong></span>
 				</div>
 				<div class="col-md-10 custom_col">
-					<input type="text" class="form-control" style="border-radius: inherit;" title="address" ng-model="sampleStore.enterprise.address" maxlength="30"/>
+					<input type="text" class="form-control" style="border-radius: inherit;" title="address" ng-model="sampleStore.enterprise.address" maxlength="50"/>
 				</div>
 			</div>
 			<div class="row com_row" style="margin-top: 10px;">
@@ -703,7 +703,7 @@
 					<span>电&nbsp;&nbsp;&nbsp;&nbsp;话<strong class="text-inverse">*</strong></span>
 				</div>
 				<div class="col-md-10 custom_col">
-					<input type="text" class="form-control" style="border-radius: inherit;" title="enTel"  ng-pattern="/^(\d){8,12}$/" ng-model="sampleStore.enterprise.enTel" maxlength="12"/>
+					<input type="text" class="form-control" style="border-radius: inherit;" title="enTel"  ng-pattern="/^[\d-]{8,20}$/" ng-model="sampleStore.enterprise.enTel" maxlength="20"/>
 				</div>
 			</div>
 			<div class="row com_row" style="margin-top: 10px;">