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

admin

2020-04-01 c70caa91e6b0e1f944b148b55685aca43bb90783

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java

@@ -258,7 +258,7 @@
         if (list == null || list.size() == 0) {

            List<ESOrder> listES = esOrderService.query(key, uid.toString(), null);

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

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

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

               count = commonOrderService.countSearchOrderByUid(uid, listES);

            }

         } else {