Merge branch 'main' of https://github.com/loongzcode/AiuTest-Python

loongzcode · loongzcode · commit 142fd77d8a01 · 2025-01-15T12:50:06.000+08:00
# Conflicts:
#	README.md
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # AiuTest-Python
 ## &#25216;&#26415;&#26632;
 ```python
@@ -47,3 +48,6 @@
 |sql&#25552;&#21462;|sqlExData|
 |&#26159;&#21542;&#25191;&#34892;|is_true|&#20998;&#32452;&#25191;&#34892;|
 
+=======
+# AiuTest-Python
+>>>>>>> 8d854ee9935a0477c73dec0762238774daf30b32

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 +<<<<<<< HEAD
 # AiuTest-Python
 ## 技术栈
 ```python
 |sql提取|sqlExData|
 |是否执行|is_true|分组执行|
 +=======
 +# AiuTest-Python
 +>>>>>>> 8d854ee9935a0477c73dec0762238774daf30b32