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

yujian

2020-06-29 c2e3dea0d75b7239b1ed66c9d9e1bbb177050858

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