Merge pull request '21373146陈心扬第十题第三关' (#15 ) from buaa21373146/BUAA-SE-2023-Lab01-Group4:Feature-21373146 into dev

21373146Lab01t10,3rd
Merge pull request '21373147----------' (#14 ) from buaa21373147/BUAA-SE-2023-Lab01-Group4:master into dev
3 changed files with 8 additions and 5 deletions
--- a/Function-21371389.py
+++ b/Function-21371389.py
@ -1,2 +1,3 @@
-# Function-21371389.py 文件的内容修改为
-print('My Student_ID is 21371389')
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371389')
+print('My Name is 马子杰')
--- a/Function-21373146.py
+++ b/Function-21373146.py
@ -1 +1,2 @@
-print('My Student_ID is 21373146')
+print('My Student_ID is 21373146')
+print('My Name is 陈心扬')
--- a/main.py
+++ b/main.py
@ -1,3 +1,4 @@
+# main.py 文件的内容修改为
 import os
-os.system('python Function-21371326.py')
-os.system('echo Feature-21371326')
+os.system('python Function-21373146.py')
+os.system('echo Feature-21373146')
Author	SHA1	Message	Date
buaa21371518	f4cb5ee179	Merge pull request '21373146陈心扬第十题第三关' (#15 ) from buaa21373146/BUAA-SE-2023-Lab01-Group4:Feature-21373146 into dev	2 years ago
陈心扬	2224109c63	21373146Lab01t10,3rd	2 years ago
buaa21371518	28a2608640	Merge pull request '21373147----------' (#14 ) from buaa21373147/BUAA-SE-2023-Lab01-Group4:master into dev	2 years ago
Huier	c0948a3346	scasd	2 years ago
buaa21371389	7e70c344ea	同意PR请求	2 years ago
马子杰	0d7d5b5381	feature function 21371389	2 years ago
buaa21371389	956f9d75e5	同意合并	2 years ago
马子杰	b50968bd20	Function-21371389 modified	2 years ago
马子杰	3c5b4d238b	Merge branch 'Student-21371389' into dev	2 years ago
马子杰	eb0ea8dc4b	main.py modified	2 years ago
马子杰	5ad84e55ae	Merge branch 'Student-21371389' into dev	2 years ago
马子杰	01ec90149c	Function-21371389.py submitted	2 years ago
buaa21373146	94bae5539d	Merge pull request '21373146陈心扬第十题第二关' (#7 ) from Feature-21373146 into dev	2 years ago
陈心扬	8e561103ff	Conflict solved	2 years ago
陈心扬	b4506265ef	21373146 t10 2	2 years ago
陈心扬	94df0988ab	Conflict Solved	2 years ago
陈心扬	9984e32b94	Conflict Solved	2 years ago
陈心扬	5c30c4c589	把mian改成main	2 years ago
陈心扬	5ef4b3bc0b	21373146 lab01 t9 t8	2 years ago