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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

         }