Merge remote-tracking branch 'origin/develop' into develop

master
yixian 4 years ago
commit eee0da230b

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>2.3.38</version>
<version>2.3.40</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

@ -306,7 +306,7 @@
</div>
<!--end 商户联系资料-->
<div class="panel panel-default">
<div class="panel-heading">Address Information</div>
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6" ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}">

@ -244,7 +244,7 @@
</div>
<!--end 商户联系资料-->
<div class="panel panel-default">
<div class="panel-heading">Address Information</div>
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">

@ -177,7 +177,7 @@
</div>
<!--end 商户联系资料-->
<div class="panel panel-default">
<div class="panel-heading">Address Information</div>
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">

@ -993,7 +993,7 @@
</div>
<!--end 商户联系资料-->
<div class="panel panel-default">
<div class="panel-heading">Address Information</div>
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6"

@ -851,7 +851,7 @@
</div>
<!--end 商户联系资料-->
<div class="panel panel-default">
<div class="panel-heading">Address Information</div>
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6" ng-class="{'has-error':partnerForm.address.$invalid && partnerForm.address.$dirty}">

@ -506,7 +506,7 @@
</div>
<!--end 商户联系资料-->
<div class="panel panel-default">
<div class="panel-heading">Address Information</div>
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">
@ -1157,7 +1157,7 @@
</div>
<!--end 商户联系资料-->
<div class="panel panel-default">
<div class="panel-heading">Address Information</div>
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">

@ -618,7 +618,7 @@
<!--end 商户联系资料-->
<div class="panel panel-default">
<div class="panel-heading">Address Information</div>
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">

@ -1082,7 +1082,7 @@
</div>
<!--end 商户联系资料-->
<div class="panel panel-default">
<div class="panel-heading">Address Information</div>
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">

@ -901,7 +901,7 @@
<!--end 商户联系资料-->
<div class="panel panel-default">
<div class="panel-heading">Address Information</div>
<div class="panel-heading">Address Information(<span style="color: red">Registered address on your business license.</span>)</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group col-sm-6">

Loading…
Cancel
Save