Merge pull request 'feature21371326 to dev' (#6 ) from buaa21371326/BUAA-SE-2023-Lab01-Group4:Feature-21371326 into master

resolve conflict in question3
Merge branch 'Feature-21371326' of https://bdgit.educoder.net/buaa21371326/BUAA-SE-2023-Lab01-Group4 into Feature-21371326
2 changed files with 4 additions and 1 deletions
--- a/Feature-21371326.py
+++ b/Feature-21371326.py
@ -0,0 +1,2 @@
+print('My Student_ID is 21371326')
+print('My Name is 杨一堂')
--- a/main.py
+++ b/main.py
@ -1,2 +1,3 @@
 import os
-os.system('python Function-21371518.py')
+os.system('python Function-21371326.py')
+os.system('echo Feature-21371326')
Author	SHA1	Message	Date
buaa21371518	e84f8253a7	Merge pull request 'feature21371326 to dev' (#6 ) from buaa21371326/BUAA-SE-2023-Lab01-Group4:Feature-21371326 into master	2 years ago
杨一堂	0ad4a89246	resolve conflict in question3	2 years ago
杨一堂	b8181b3ebe	Merge branch 'Feature-21371326' of https://bdgit.educoder.net/buaa21371326/BUAA-SE-2023-Lab01-Group4 into Feature-21371326 merge feature21371326 to push	2 years ago
杨一堂	5e50264697	Merge branch 'Feature-21371326' of https://bdgit.educoder.net/buaa21371326/BUAA-SE-2023-Lab01-Group4 into Feature-21371326	2 years ago
buaa21371518	75585eb1a2	Merge pull request '第三关PR21371518' (#4 ) from Feature-21371518 into dev	2 years ago
杨一堂	cde1b6522f	21371326 modify main.py	2 years ago
21371518	d10c60683c	合作PR	2 years ago
buaa21371326	502a348ca5	merge 21371326	2 years ago
杨一堂	63bbf1d5ce	feature 21371326 commit	2 years ago