Merge branch 'feature-nationcode' into 'master'

增加收货人区号

See merge request !2471

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderDetailVO.java

@@ -102,6 +102,11 @@ public class OrderDetailVO implements Serializable {
     private String buyerPhone;
 
     /**
+     * 收货人区号
+     */
+    private String buyerNationcode;
+
+    /**
      * 自提门店ID
      */
     private String pickUpStoreId;
@@ -270,6 +275,14 @@ public class OrderDetailVO implements Serializable {
         this.buyerPhone = buyerPhone;
     }
 
+    public String getBuyerNationcode() {
+        return buyerNationcode;
+    }
+
+    public void setBuyerNationcode(String buyerNationcode) {
+        this.buyerNationcode = buyerNationcode;
+    }
+
     public void setPickUpStoreId(String pickUpStoreId) {
         this.pickUpStoreId = pickUpStoreId;
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderExchangeDetailVO.java

@@ -112,6 +112,11 @@ public class OrderExchangeDetailVO implements Serializable {
     private String buyerPhone;
 
     /**
+     * 收货人区号
+     */
+    private String buyerNationcode;
+
+    /**
      * 买家物流号（退货物流）
      */
     private String buyerLogisticsCode;
@@ -787,6 +792,14 @@ public class OrderExchangeDetailVO implements Serializable {
         this.buyerPhone = buyerPhone;
     }
 
+    public String getBuyerNationcode() {
+        return buyerNationcode;
+    }
+
+    public void setBuyerNationcode(String buyerNationcode) {
+        this.buyerNationcode = buyerNationcode;
+    }
+
     public void setBuyerLogisticsCode(String buyerLogisticsCode) {
         this.buyerLogisticsCode = buyerLogisticsCode;
     }