fix

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

@@ -18,22 +18,38 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "web_whole_sale_order_don wod inner join web_whole_sale_order_don_code_relate odr on wod.id = odr.oder_id" +
+		" left join web_info wo on wo.user_id = wod.user_id" +
 		" left join user u on u.id = odr.dh_user_id")
 public class WebWholesaleCodeDetailView {
+	/**
+	 * 店铺主id
+	 */
 	@DbField("wod.user_id")
 	private Long userId;
 
+	/**
+	 * 店铺名
+	 */
+	@DbField("wo.shop_name")
+	private String shopName;
+
 	@DbField("wod.id")
 	private Long orderId;
 
 	@DbField("wod.order_no")
 	private String orderNo;
 
+	/**
+	 * 兑换用户id
+	 */
 	@DbField("odr.dh_user_id")
 	private Long dhUserId;
 
+	/**
+	 * 兑换用户
+	 */
 	@DbField("u.nickname")
-	private String nickname;
+	private String dfNickname;
 
 	/**
 	 * 支付状态

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

@@ -17,11 +17,14 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "web_whole_sale_order_don wod")
+@SearchBean(tables = "web_whole_sale_order_don wod left join web_info wo on wo.user_id = wod.user_id")
 public class WebWholesaleOrderView {
 	@DbField("wod.user_id")
 	private Long userId;
 
+	@DbField("wod.shop_name")
+	private String shopName;
+
 	@DbField("wod.money")
 	private BigDecimal money;