Commit 4929f083 authored by 332784038@qq.com's avatar 332784038@qq.com

Merge branch 'release-fix' into release

parents 809ce1b2 0d5f9725
...@@ -386,6 +386,9 @@ public class OrderBaseVO { ...@@ -386,6 +386,9 @@ public class OrderBaseVO {
@ApiModelProperty(value = "放货箱数") @ApiModelProperty(value = "放货箱数")
private Integer releaseNum; private Integer releaseNum;
@ApiModelProperty(value = "是否有收货人,1-是,0-否")
private Boolean hasConsignee = true;
public void setExceptionReason(String exceptionReason) { public void setExceptionReason(String exceptionReason) {
this.exceptionReason = StringUtils.isNotBlank(exceptionReason) ? I18nMessage.getMessage(exceptionReason) : exceptionReason; this.exceptionReason = StringUtils.isNotBlank(exceptionReason) ? I18nMessage.getMessage(exceptionReason) : exceptionReason;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment