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

yujian

2019-09-05 e9a3f108de4f79fe6f246cd30f4427fc6aad5450

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java

@@ -165,7 +165,7 @@
         return;

      }

      // 获取免单券数量

      long couponCount = userSystemCouponService.count

      long couponCount = userSystemCouponService.countUsableRewardCoupon(uid);

      JSONObject userJson = new JSONObject();

      userJson.put("nickName", user.getNickName());

      userJson.put("portrait", user.getPortrait());