Merge pull request 'feature/test-merge-v2' (#6) from feature/test-merge-v2 into main

Reviewed-on: http://192.168.1.111:3000/zhenbao_huang/test/pulls/6
2026-01-16 01:21:07 +00:00
parent 9f4d8aa32f fcc7fb80b2
commit ad21385dbf
2 changed files with 3 additions and 0 deletions
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -56,6 +56,8 @@
 		</view>
 		
 		<view>测试</view> 
+		<view>测试2</view> 
+
 		
 		<view class="select">
 			<common-title>
--- a/test.txt
+++ b/test.txt
@@ -0,0 +1 @@
+New test content