Merge branch 'master' into pre

# Conflicts:
#	netflix-dao/src/main/resources/mapper/CorpUserTagMapper.xml

netflix-dao/src/main/resources/mapper/CorpUserTagMapper.xml

@@ -89,15 +89,14 @@
         as intention
         from (select relation_id
         from `corp_user_tag` ct
-        where tag_id = #{tagIdStr}
-        group by relation_id
-        <if test="thisDate != null">
-            having date_format(min(ct.created_time),'%Y-%m-%d') = #{thisDate}
-        </if>) s
+        where tag_id = #{tagIdStr}) s
         left join corp_user_follow_relation cufr on cufr.id = s.relation_id
         left join corp_user_auth ca on ca.external_userid = cufr.corp_user_id
         left join corp_user cu on cu.id = ca.corp_user_id
         inner join corp_user_pay_intention ccc on ccc.union_id = cu.unionid
+        <if test="thisDate != null">
+            and date_format(cu.created_time,'%Y-%m-%d') = #{thisDate}
+        </if>
         group by ccc.intention
     </select>
 

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -745,7 +745,11 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
         view.setScore(Math.min(score, 200));
         view.setStatus(score >= 50 ? "繁忙" : "空闲"); // 或“繁忙”
 
-        view.setType(isPlus == 1 ? "plus" : "3.5");
+        if(carName.contains("T")){
+            view.setType("Team");
+        }else {
+            view.setType(isPlus == 1 ? "Plus" : "3.5");
+        }
         int use = getCarConversationCount(carId, 3L).intValue();
         view.setUse(use);
         Long aLong = carOaiLimit(carId);