diff --git a/Function-21371192.py b/Function-21371192.py index 5ec4ddb..8ab49ee 100644 --- a/Function-21371192.py +++ b/Function-21371192.py @@ -1 +1,2 @@ -print('My Student_ID is 21371192') \ No newline at end of file +print('My Student_ID is 21371192') +print('My Name is 王晰') \ No newline at end of file diff --git a/Function-21371193.py b/Function-21371193.py index 649b968..7bc1c7f 100644 --- a/Function-21371193.py +++ b/Function-21371193.py @@ -1 +1,2 @@ -print('My Student_ID is 21371193') \ No newline at end of file +print('My Student_ID is 21371193') +print('My Name is 张文津') \ No newline at end of file diff --git a/Function-21371413.py b/Function-21371413.py index d3e4dc6..2957b3f 100644 --- a/Function-21371413.py +++ b/Function-21371413.py @@ -1,3 +1,2 @@ -# main.py 文件的内容修改为 -import os -os.system('python Function-21371413.py') \ No newline at end of file +print('My Student_ID is 21371413') +print('My Name is 尤世博') \ No newline at end of file diff --git a/Function-21371427.py b/Function-21371427.py index 1da13de..4eec13f 100644 --- a/Function-21371427.py +++ b/Function-21371427.py @@ -1 +1,2 @@ -print('My Student_ID is 21371427') \ No newline at end of file +print('My Student_ID is 21371427') +print('My Name is luochuan') \ No newline at end of file diff --git a/Function-21371434.py b/Function-21371434.py index c9522e7..8746528 100644 --- a/Function-21371434.py +++ b/Function-21371434.py @@ -1 +1,2 @@ -print('My Student_ID is 21371434') \ No newline at end of file +print('My Student_ID is 21371434') +print('My Name is 龚翼辉') \ No newline at end of file diff --git a/main.py b/main.py index 637e6a6..f3c55b6 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,8 @@ import os +<<<<<<< HEAD os.system('python Function-21371192.py') -os.system('echo Feature-21371192') \ No newline at end of file +os.system('echo Feature-21371192') +======= +os.system('python Function-21371434.py') +os.system('echo Feature-21371434') +>>>>>>> dev