Merge branch 'dev'

Merge pull request '1' (#9 ) from Feature-21371334 into dev
Merge pull request 'Feature-21371363' (#7 ) from Feature-21371363 into dev
7 changed files with 12 additions and 3 deletions
--- a/Function-21371334.py
+++ b/Function-21371334.py
@ -1 +1,2 @@
 print('My Student_ID is 21371334')
 print('My Name is 何宇楷')
--- a/Function-21371363.py
+++ b/Function-21371363.py
@ -0,0 +1 @@
 print('My Student_ID is 21371363')
--- a/Function-21373129.py
+++ b/Function-21373129.py
@ -0,0 +1,2 @@
 print('My Student_ID is 21373129')
 print('My Name is 王剑飞')
--- a/Function-21373135.py
+++ b/Function-21373135.py
@ -0,0 +1,2 @@
 print('My Student_ID is 21373135')
 print('My Name is 李扬')
--- a/Function-21373138.py
+++ b/Function-21373138.py
@ -0,0 +1,3 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21373138')
 print('My Name is 夏厚敬')
--- a/README.md
+++ b/README.md
@ -1,2 +1,2 @@
 # BUAA-SE-2023-Lab01-Group20
-1
+
--- a/main.py
+++ b/main.py
@ -1,2 +1,2 @@
 import os
-os.system('python Function-21371334.py')
+os.system('python Function-21373129.py')
Author	SHA1	Message	Date
王剑飞	0b4fa3588c	Merge branch 'dev'	2 years ago
buaa21373129	d166874303	Merge pull request '1' (#9 ) from Feature-21371334 into dev	2 years ago
buaa21373129	9dd86f3cd9	Merge pull request 'Feature-21371363' (#7 ) from Feature-21371363 into dev	2 years ago
buaa21373129	879d0c0e53	Merge pull request 'Feature-21373135 -> dev' (#8 ) from Feature-21373135 into dev	2 years ago
buaa21373129	c94e9526d1	Merge pull request '21373129request' (#10 ) from Feature-21373129 into dev	2 years ago
buaa21373129	73f79cd991	Merge pull request '111111111' (#11 ) from Feature-21373138 into dev	2 years ago
王剑飞	3fb06003a3	21373129	2 years ago
夏厚敬	e544dbed26	单人PR	2 years ago
李扬	0989e7d09f	10-2-2	2 years ago
Heyukai	53d6a366ec	21371334	2 years ago
Heyukai	4684afc29c	21371334	2 years ago
陈子恒	c878fc63db	21371363	2 years ago
王剑飞	494bc66313	Merge branch 'dev'	2 years ago
陈子恒	5b9b34b090	Conflict Solved	2 years ago
陈子恒	94ed0263b2	21373138	2 years ago
陈子恒	21d9db4d02	21373138	2 years ago
陈子恒	5a5c55f5b5	1	2 years ago
陈子恒	e05af69a34	Conflict Solved	2 years ago
陈子恒	11998ea7e8	test	2 years ago
Heyukai	de4c348189	Conflict Solved	2 years ago
Heyukai	7473e99ec8	Merge branch 'Student-21371334' into dev	2 years ago
Heyukai	f93cb26398	Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev	2 years ago
Heyukai	492d03a7ae	Merge branch 'Student-21371334' into dev	2 years ago
夏厚敬	4701a749f0	Conflict Solved	2 years ago
夏厚敬	6fc47ffb28	21373138	2 years ago
李扬	fc2e402d65	Conflict Solved	2 years ago
李扬	2a6b401eda	add_main	2 years ago
李扬	beaa68962d	Conflict Solved	2 years ago
王剑飞	062ecb287f	new	2 years ago
王剑飞	8006cd1599	new	2 years ago
王剑飞	181e0ec99b	21373129	2 years ago
陈子恒	96b8be4fb3	main.py	2 years ago
李扬	09c612fe38	add_main	2 years ago
陈子恒	11e7bbf13e	Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev	2 years ago
Heyukai	9a4266141a	Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev	2 years ago
Heyukai	52a0507b3a	Merge branch 'Student-21371334' into dev	2 years ago
陈子恒	96b244d46a	Name	2 years ago
陈子恒	fe999c2ca2	Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev	2 years ago
Heyukai	39a9a8371e	Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev	2 years ago
Heyukai	d517d973ec	21371334	2 years ago
夏厚敬	f19b56fcb7	Merge branch 'Student-21373138' into dev	2 years ago
夏厚敬	8ec18a1fc1	21373138	2 years ago
陈子恒	d88a6318b8	Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into Student-21371363	2 years ago
王剑飞	d7dd598965	pushmain	2 years ago
陈子恒	dd1f6dd237	Function-21371363.py	2 years ago
Heyukai	94ab22b46e	Merge branch 'dev' of https://bdgit.educoder.net/buaa21373129/BUAA-SE-2023-Lab01-Group20 into dev	2 years ago
李扬	eca0850988	Merge branch 'Student-21373135' into dev	2 years ago
李扬	d11a17cfb7	test1	2 years ago
王剑飞	7d8ce4036d	test	2 years ago
`@ -1 +1,2 @@`
	`print('My Student_ID is 21371334')`	`print('My Student_ID is 21371334')`
		`print('My Name is 何宇楷')`
		`@ -0,0 +1,2 @@`
							`print('My Student_ID is 21373129')`
							`print('My Name is 王剑飞')`
		`@ -0,0 +1,2 @@`
							`print('My Student_ID is 21373135')`
							`print('My Name is 李扬')`
`@ -1,2 +1,2 @@`
	`# BUAA-SE-2023-Lab01-Group20`	`# BUAA-SE-2023-Lab01-Group20`
	`1`
`@ -1,2 +1,2 @@`
	`import os`	`import os`
	`os.system('python Function-21371334.py')`	`os.system('python Function-21373129.py')`