合并冲突

zhangyongtian

2024-09-08 f7452b9d6295748c9840245d26df6514e8ed2c1d

 gz-wxparty/pages/homePage/index.json

@@ -1,6 +1,5 @@
{
   "navigationBarBackgroundColor": "#ffffff",
   "navigationBarTextStyle": "black",
	
   "usingComponents": {
      "time-format": "../../components/time-format/index"
   }