fix: 解决 merge 冲突 - health-main/index-home 合并冲突 & AiGateway 保留

cfc-backend/src/main/java/com/etotem/cfc/service/AiGateway.java

@@ -13,8 +13,6 @@ import org.springframework.http.HttpEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.PostConstruct;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;

cfc-frontend/pages/health-main/index.vue

@@ -502,7 +502,6 @@ export default {
       return status === 'resolved' ? 'resolved' : 'pending'
     },
     goSelfTest: function() { uni.navigateTo({ url: '/pages/health/survey-questionnaire?dim=all' }) },
-    
     goPlanSummary: function() {
       var url = '/pages/health/health-plan-summary'
       if (this.selectedMemberId) url += '?memberId=' + this.selectedMemberId

cfc-frontend/pages/index-home/index.vue

@@ -46,7 +46,6 @@
 
   <!-- 登录态 — 直接内嵌，保持底签可见 -->
   <view v-if="currentRole" class="logged-in-container">
-<<<<<<< Updated upstream
     <!-- ① 了解区 — 自测大卡（首屏，引导"从了解开始"） -->
     <view class="self-test-card" @click="goSelfTest">
       <view class="self-test-head">
@@ -60,9 +59,6 @@
     </view>
 
     <!-- ② 发现区 — 能量沙盘 — Canvas 五行星图（未测评时显示引导卡） -->
-=======
-    <!-- 能量沙盘 — Canvas 五行星图（未测评时显示引导卡） -->
->>>>>>> Stashed changes
     <GateLock v-if="sandboxLocked && sandboxLockGate" :gate="sandboxLockGate" />
     <WuxingSandbox
       v-else-if="sandboxData"