Merge remote-tracking branch 'origin/wholesale' into wholesale

wholesale/src/main/java/com/yhlxj/dao/model/view/WebWholesaleCodeDetailView.java

@@ -17,7 +17,7 @@ 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" +
+@SearchBean(tables = "web_wholesale_order_don wod inner join web_wholesale_order_don_code_relate odr on wod.id = odr.order_id" +
 		" left join user u on u.id = odr.dh_user_id")
 public class WebWholesaleCodeDetailView {
 	@DbField("wod.user_id")

wholesale/src/main/java/com/yhlxj/dao/model/view/WebWholesaleOrderDonCodeDetailView.java

@@ -17,7 +17,7 @@ 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")
+@SearchBean(tables = "web_wholesale_order_don wod inner join web_wholesale_order_don_code_relate odr on wod.id = odr.order_id")
 public class WebWholesaleOrderDonCodeDetailView {
 
 	@DbField("wod.id")

wholesale/src/main/java/com/yhlxj/dao/model/view/WebWholesaleOrderView.java

@@ -17,7 +17,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "web_whole_sale_order_don wod")
+@SearchBean(tables = "web_wholesale_order_don wod")
 public class WebWholesaleOrderView {
 	@DbField("wod.wholesale_id")
 	private Long wholesaleId;