合并

src/components/workspace/CashManagement.vue

@@ -37,15 +37,9 @@
     <div class="chart-container">
       <!-- 左侧数据列表 -->
       <div class="market-data">
-<<<<<<< HEAD
         <div v-if="marksFlag" v-for="market in cashData.markets" :key="market.name" class="market-item">
           <span class="market-name">{{ market.name }}：</span>
           <span class="market-value">{{ market.value.toLocaleString() }} 新币</span>
-=======
-        <div v-for="market in cashData.markets" :key="market.name" class="market-item">
-          <span class="market-name">{{ market.name }}:</span>
-          <span class="market-value">{{ market.value.toLocaleString() }}</span>
->>>>>>> lihuilin/feature-20250923114949-现金
         </div>
         <div v-else>
           <div v-for="item in cashData.markets" :key="item.name" class="market-item">