Merge branch 'order_fields'

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonView.java

@@ -23,7 +23,8 @@ import java.util.Date;
         "left join user u on o.user_id = u.id " +
         "left join groups_relation gr on gr.id = o.relation_id " +
         "left join channel_popularize cp on o.popularize_id = cp.id " +
-        "left join channel c on c.id = cp.channel_id "
+        "left join channel c on c.id = cp.channel_id " +
+        "left join order_don_transport odt on odt.order_id = o.id"
 )
 public class OrderDonView {
 
@@ -108,6 +109,42 @@ public class OrderDonView {
     @DbField("o.sub_node")
     private String subNode;
 
+    /**
+     * 收货人
+     */
+    @DbField("odt.receiver")
+    private String receiver;
+
+    /**
+     * 手机号
+     */
+    @DbField("odt.phone")
+    private String phone;
+
+    /**
+     * 省份
+     */
+    @DbField("odt.province")
+    private String province;
+
+    /**
+     * 城市
+     */
+    @DbField("odt.city")
+    private String city;
+
+    /**
+     * 区/县
+     */
+    @DbField("odt.district")
+    private String district;
+
+    /**
+     * 详细地址
+     */
+    @DbField("odt.address")
+    private String address;
+
     @DbIgnore
     private OrderDonWaybill waybill;