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

admin

2019-11-06 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java

@@ -48,7 +48,7 @@
   @RequestMapping("getOrderList")

   public void getOrderList(AcceptData acceptData, Long uid, int page, String callback, PrintWriter out) {

      List<ElmeUserOrderVO> voList = new ArrayList<>();

      List<ElmeHongBaoOrderMap> list = elmeHongBaoOrderMapService.listByHongBaoUid(uid, page, Constant.PAGE_SIZE);

      List<ElmeHongBaoOrderMap> list = elmeHongBaoOrderMapService.listByHongBaoUid(uid, page, 3);

      if (list != null)

         for (ElmeHongBaoOrderMap map : list)

            voList.add(create(map));