Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	Function-21373335.py
master
QAQLeonard 2 years ago
commit 62b993e567

@ -0,0 +1,3 @@
# Function-学号.py 文件的内容修改为
print('My Student_ID is 21373328')
print('My Name is 王陆昊')

@ -0,0 +1,3 @@
print('My Student_ID is 21373330')
print('My Name is 吴浩宇')

@ -0,0 +1,2 @@
print('My Student_ID is 21373335')
print('My Name is wrj')

@ -0,0 +1,2 @@
print('My Student_ID is 21373339')
print('My Name is 周星达')

@ -1,2 +0,0 @@
# BUAA-SE-2023-Lab01-Group8

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