Merge branches 'develop' and 'feature/1.9.11-明警' of…

Merge branches 'develop' and 'feature/1.9.11-明警' of gitlab.freemud.com:order-group-application/order-group into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -794,6 +794,7 @@ public class OrderSdkAdapter {
                         data.setLatitude(orderInfoReqs.getDeliveryContactInfoList().get(0).getLatitude().doubleValue());
                         data.setLongitude(orderInfoReqs.getDeliveryContactInfoList().get(0).getLongitude().doubleValue());
                         data.setTakeAddress(orderInfoReqs.getDeliveryContactInfoList().get(0).getAddressDetail());
+                        data.setGender(orderInfoReqs.getDeliveryContactInfoList().get(0).getGender());
                     }
                 }
                 if (deliveryContactInfoResp.getRelateObjectType() == 3) {

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -175,6 +175,12 @@ public class QueryOrdersResponse {
              * 手机号
              */
             private String phone;
+
+            /**
+             * 性别
+             */
+            private Byte gender;
+
             private String posId;
             private String remark;
             /**

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/DeliveryContactInfoResp.java

@@ -61,4 +61,7 @@ public class DeliveryContactInfoResp {
     //运单号
     private String expressNo;
 
+    //性别
+    private Byte gender;
+
 }