Merge remote-tracking branch 'origin/master'

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

@@ -25,7 +25,7 @@ import java.util.List;
 @Setter
 @SearchBean(tables = "order_don o left join goods_don g on g.id = o.goods_id " +
 		"left join user u on o.user_id = u.id " +
-		"left join order_don_transport odt on odt.order_id = o.id",
+		"left join order_don_transport odt on odt.order_id = o.id ",
 		where = ":condition:"
 )
 public class OrderDonBackView {
@@ -77,6 +77,12 @@ public class OrderDonBackView {
 	@DbField("o.sku_id")
 	private Long skuId;
 
+	/**
+	 * 平台id
+	 */
+	@DbField("o.goods_id")
+	private Long goodsId;
+
 	@DbIgnore
 	private String specVal;