diff --git a/pages/test/ceshi.vue b/pages/test/ceshi.vue
index c1d502e..4e8045b 100644
--- a/pages/test/ceshi.vue
+++ b/pages/test/ceshi.vue
@@ -164,7 +164,11 @@
 				});
 			},
 			executeSql(sql) {
+<<<<<<< HEAD
 				sqlite.executeSqlCeshi(sql).then((value) => {
+=======
+				Sqlite.executeSqlCeshi(sql).then((value) => {
+>>>>>>> 99e78e950aa9ec6dccfe44174d8f77ac3239cf00
 					// 在resolve时执行的回调函数
 					this.sqlData = value
 					console.log(value); // 输出：Hello, World!