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

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

 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";