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

admin

2020-01-03 ecb361733a4f90ad1672c422577292a18c0fd2bb

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/ESOrderService.java

@@ -18,7 +18,7 @@
    * @param uid

    * @return

    */

   List<ESOrder> query(String key, String uid);

   List<ESOrder> query(String key, String uid, List<Integer> listPlatform);

   

   

}