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

src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -385,7 +385,7 @@ public class ReleaseProductByBatch implements Serializable {
 	/**
 	 * 错误的信息
 	 */
-	@Column(name = "rel_errmsg")
+	@Column(name = "rel_errmsg", length = 4000)
 	private String errmsg;
 
 	/**

src/main/webapp/resources/view/common/modal/edit_address_modal.html

@@ -88,7 +88,8 @@
 				    </div>
 					<div class="col-md-3">
 						<span class="text-inverse error" ng-show="address.name && userError">请勿超过10个字</span>
-						<span class="text-inverse heigth30" ng-show="myForm.userName.$touched && myForm.userName.$invalid">请输入发件人姓名</span>
+						<span class="text-inverse heigth30" ng-show="myForm.userName.$touched && myForm.userName.$invalid && isSendType">请输入发件人姓名</span>
+						<span class="text-inverse heigth30" ng-show="myForm.userName.$touched && myForm.userName.$invalid && !isSendType">请输入收件人姓名</span>
 						<span ng-show="!myForm.userName.$invalid && !userError" class="text-success heigth30">填写正确</span>
 					</div>
 				</div>