冲突解决

litian

2024-02-29 60bae3bf527b15fc5aefd555d7c76916b012b823

 custom-tab-bar/data.js

@@ -27,7 +27,10 @@
  {
    text: '个人中心',
    url: 'pages/personalCenter/index',
<<<<<<< HEAD
    icon: '/static/images/home/my@2x.png',
    activeIcon: '/static/images/home/my-click@2x.png'
=======
>>>>>>> master
  },
];