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

admin

2020-04-22 d22d18f40d088277195e5c3ab587d07450f1a94d

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java

@@ -313,7 +313,11 @@
         List<ESOrder> listES = esOrderService.query(key, uid.toString(), listSource);



         if (listES.size() != 0) {

            list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);

            // 2.1版本

            AcceptData acceptData = new AcceptData();

            acceptData.setPlatform("android");

            acceptData.setVersion("56");

            list = commonOrderService.searchOrderByUid(acceptData, page, Constant.PAGE_SIZE, uid, listES);

            count = commonOrderService.countSearchOrderByUid(uid, listES);

         }