Merge remote-tracking branch 'origin/dev'

main.py

@@ -1,8 +1,3 @@
-<<<<<<< HEAD
 import os
-os.system('python Function-21373339.py')
+os.system('python Function-21373330.py')
-=======
+os.system('echo Function-21373330')
-# main.py 文件的内容修改为
-import os
-os.system('python Function-21373328.py')
->>>>>>> origin/Student-21373328