Merge remote-tracking branch 'origin/dev' into Student-20231161

# Conflicts: # main.py
1 changed files with 1 additions and 1 deletions
--- a/main.py
+++ b/main.py
@ -1,2 +1,2 @@
 import os
-os.system('python Function-20231017.py')
+os.system('python Function-20231161.py')
Author	SHA1	Message	Date
冯伟伦	07edd041d3	Merge remote-tracking branch 'origin/dev' into Student-20231161 # Conflicts: # main.py	2 years ago
冯伟伦	8390f0e181	Merge remote-tracking branch 'origin/dev' into Student-20231161 # Conflicts: # main.py	2 years ago
冯伟伦	4f85a19413	test	2 years ago