feat(合并代码): 和冰帝阿

闫增涛

2024-03-05 14de3e90ae29af2ccfd51b08c6a11ab02fe8f8e7

 pages/personalCenter/index.wxml

@@ -1,4 +1,3 @@
<<<<<<< HEAD
<view class="background {{ isWhite ? 'white':''}}">
  <text class="text">个人中心</text>
</view>
@@ -68,8 +67,4 @@
      </view>
    </view>
  </view>
</view>
=======
<!--pages/personalCenter/index.wxml-->
<text>pages/personalCenter/index.wxml</text>
>>>>>>> master
</view>