Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/dto/jd/JDSearchFilter.java

@@ -13,10 +13,9 @@
   // 30天支出佣金

   public final static String SORTNAME_ORDER_COMM_30DAYS = "inOrderComm30Days";

   

   // 排序方式

   public final static String SORT_ASC = "asc";

   public final static String SORT_DESC = "desc";

	




   private int pageNo;// 页码

   private int pageSize;// 每页的数量