Merge branch 'corp_intention' into pre

# Conflicts:
#	netflix-dao/src/main/resources/mapper/UserMapper.xml

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

@@ -19,7 +19,8 @@ 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.user_id = o.user_id " +
+		"left join user u on u.id = o.user_id")
 public class CorpWxOrderDonView {
 	@DbField("o.id")
 	private Long id;
@@ -83,4 +84,7 @@ public class CorpWxOrderDonView {
 
 	@DbField("o.pay_title")
 	private String payTitle;
+
+	@DbField("u.nickname")
+	private String nickname;
 }

netflix-dao/src/main/resources/mapper/UserMapper.xml

@@ -41,7 +41,7 @@
     </select>
 
     <select id="selectUserById" resultType="com.cyksj.model.entity.User">
-        select id,login_phone,email,headimgurl from user
+        select id,login_phone,email,headimgurl,nickname from user
         where
         <if test="pid != null">
             id = #{pid}