Merge branch 'dev' into Feature-20374319

# Conflicts: # main.py
3 years ago · 4af568db79
parent 99aea97f57 04ff1d6ee4
commit 4af568db79
2 changed files with 4 additions and 3 deletions
--- a/Function-20351005.py
+++ b/Function-20351005.py
@ -1 +1,2 @@
-print('My Student_ID is 20351005')
+print('My Student_ID is 20351005')
+print('My Name is xjx')
--- a/main.py
+++ b/main.py
@ -1,4 +1,4 @@
 # main.py 文件的内容修改为
 import os
-os.system('python Function-20374319.py')
-os.system('echo Feature-20374319')
+os.system('python Function-20241085.py')
+os.system('echo Feature-20241085')