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

soss-admin/src/main/java/com/soss/web/controller/coffee/AppController.java

@@ -125,7 +125,7 @@ public class AppController extends BaseController {
     public AjaxResult getUserAvailableCouponCnt(HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
         if (loginUser == null) {
-            throw new ServiceException("请先登录");
+            throw new ServiceException("获取信息失败，请退出后重进");
         }
         int custAvailableCouponCnt = couponUserService.getCustAvailableCouponCnt(loginUser.getOpenId());
         return AjaxResult.success(custAvailableCouponCnt);