Merge branch 'dev' of https://bdgit.educoder.net/buaa21373007/BUAA-SE-2023-Lab01-Group2 into dev

1
4 changed files with 7 additions and 4 deletions
--- a/Function-21371036.py
+++ b/Function-21371036.py
@ -1 +1,2 @@
 print('My student_ID is 21371036')
+print('My name is Haojialin')
--- a/Function-21371296.py
+++ b/Function-21371296.py
@ -1 +1,2 @@
-print('My Student_ID is 21371296')
+print('My Student_ID is 21371296')
+print('My Name is 周宝驹')
--- a/Function-21373007.py
+++ b/Function-21373007.py
@ -1,3 +1,4 @@
-print('My Student_ID is 学号')
-print('My Name is 姓名')
+
+import os
+os.system('python Function-21373007.py')

--- a/main.py
+++ b/main.py
@ -1,4 +1,4 @@
 # main.py 文件的内容修改为
 import os
 os.system('python Function-21373007.py')
-
+os.system('echo Feature-21373007')
Author	SHA1	Message	Date
苏云鹤	9d900439c6	Merge branch 'dev' of https://bdgit.educoder.net/buaa21373007/BUAA-SE-2023-Lab01-Group2 into dev	3 years ago
苏云鹤	8b8be7dcf7	1	3 years ago
苏云鹤	2065e30580	1	3 years ago
buaa21373007	f321798720	同意同意	3 years ago
郝嘉霖	c4b5643ebf	fork pull request 21371036	3 years ago
buaa21373007	11696b72f6	1 1	3 years ago
周宝驹	a210c6439c	E2	3 years ago
郝嘉霖	f2a5bfe863	pull request hjl	3 years ago