Merge branch 'corp_intention' into pre

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/model/manage/views/CorpWxOrderDonView.java

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

@@ -19,7 +19,7 @@ import java.util.Date;
 @Setter
 @SearchBean(tables = "order_don o left join goods_don_sku sku on o.sku_id = sku.id " +
 		"left join goods_don g on g.id = sku.goods_id " +
-		"left join groups_relation gr on gr.user_id = o.user_id " +
+		"left join groups_relation gr on gr.id = o.relation_id " +
 		"left join user u on u.id = o.user_id")
 public class CorpWxOrderDonView {
 	@DbField("o.id")