Merge branch 'grok_inner' into pre

netflix-dao/src/main/java/com/cyksj/model/views/GrokUserView.java

@@ -38,4 +38,6 @@ public class GrokUserView {
      */
     private Long use;
 
+    private String userToken;
+
 }

netflix-service/src/main/java/com/cyksj/service/grok/impl/GrokServiceImpl.java

@@ -69,11 +69,12 @@ public class GrokServiceImpl implements GrokService {
             GroupsTrips groupsTrips = getGroupsTrips(groupsRelation);
             GoodsDonSku goodsDonSku = skuMapper.selectById(groupsTrips.getSkuId());
 
-           GrokUserView view =GrokUserView.builder()
+            GrokUserView view = GrokUserView.builder()
                     .skuName(goodsDonSku.getSubTitle())
                     .expireTime(grokUser.getExpireTime())
                     .limitNum(grokUser.getLimitNum())
                     .limitTime(grokUser.getLimitTime())
+                    .userToken(grokUser.getUserToken())
 
                     //.use(Math.min(grokUser.getLimitNum(), getConversationCount(grokUser.getUserToken(),grokUser.getLimitTime())))
                     .build();