Commit f862e20012ea2f9bc6de82c6641c7a28a74fa9d9

Authored by 房远帅
2 parents 4d39764e 6343623c

Merge branch 'master_after20' into master_cj_zq

@@ -77,6 +77,12 @@ public class GetShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> { @@ -77,6 +77,12 @@ public class GetShipmentsOrderInfoBo extends BaseBo<ShipmentsOrderInfo> {
77 @ApiModelProperty("办事处名称") 77 @ApiModelProperty("办事处名称")
78 private String deptName; 78 private String deptName;
79 79
  80 + @ApiModelProperty("区域ID")
  81 + private String region;
  82 +
  83 + @ApiModelProperty("区域名称")
  84 + private String regionName;
  85 +
80 /** 86 /**
81 * 交货方式 87 * 交货方式
82 */ 88 */