Merge branch 'Student-21371404' into dev

On branch Student-21371404
Changes to be committed: new file: Function-21371404.py new file: main.py
2 changed files with 7 additions and 1 deletions
--- a/Function-21371404.py
+++ b/Function-21371404.py
@ -0,0 +1 @@
+print('My Student_ID is 21371404')
--- a/main.py
+++ b/main.py
@ -1,3 +1,8 @@
+#<<<<<<< HEAD
 # main.py 文件的内容修改为
+#import os
+#os.system('python Function-20374188.py')
+#=======
 import os
-os.system('python Function-20374188.py')
+os.system('python Funtion-21371404.py')
+#>>>>>>> Student-21371404
Author	SHA1	Message	Date
TRJ	f95f8c158a	Merge branch 'Student-21371404' into dev	2 years ago
TRJ	18ee1ec7b3	On branch Student-21371404 Changes to be committed: new file: Function-21371404.py new file: main.py	2 years ago
buaa20374188	f0329e95bc	Delete '截屏2022-12-23 19.33.59.png'	2 years ago
buaa20374188	3184c545f1	ADD file via upload	2 years ago