Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

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