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

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

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

@@ -12,7 +12,6 @@
   public final static String SORTNAME_ORDER_COUNT_30DAYS = "inOrderCount30Days";

   // 30天支出佣金

   public final static String SORTNAME_ORDER_COMM_30DAYS = "inOrderComm30Days";



   

   // 排序方式

   public final static String SORT_ASC = "asc";