Merge pull request '邹可心' (#22 ) from buaa21373439/BUAA-SE-2023-Lab01-Group19:Feature-21373439 into dev

conflict
Merge pull request '和并请求' (#21 ) from buaa21371177/BUAA-SE-2023-Lab01-Group19:Feature-21371177 into dev
2 changed files with 14 additions and 2 deletions
--- a/Function-21373439.py
+++ b/Function-21373439.py
@ -1,3 +1,6 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21373439')
 print('My Name is 邹可心')
+
+
+
--- a/main.py
+++ b/main.py
@ -1,4 +1,13 @@
-# main.py 文件的内容修改为
+#  main.py 文件的内容修改为
 import os
+os.system('python Function-21371177.py')
+os.system('echo Feature-21371177')
+os.system('python Function-21373493.py')
+os.system('echo Feature-21373493')
 os.system('python Function-21371345.py')
-os.system('echo Feature-21371345')
+os.system('python Function-21373439.py')
+os.system('echo Feature-21373439')
+os.system('python Function-21373439.py')
+os.system('echo Feature-21373439')
+os.system('echo Function-21371345')
+
Author	SHA1	Message	Date
buaa21371345	5bee5b2dca	Merge pull request '邹可心' (#22 ) from buaa21373439/BUAA-SE-2023-Lab01-Group19:Feature-21373439 into dev	2 years ago
Your Name	e5f0a15280	conflict	2 years ago
buaa21371345	06910e1009	Merge pull request '和并请求' (#21 ) from buaa21371177/BUAA-SE-2023-Lab01-Group19:Feature-21371177 into dev	2 years ago
root	4af6e3342e	1	2 years ago
Your Name	7cb2cdee24	try	2 years ago
buaa21371345	1204560aac	Merge pull request '21373493的合并请求2' (#19 ) from buaa21373493/BUAA-SE-2023-Lab01-Group19:Feature-21373493 into dev	2 years ago
Your Name	ba78800e98	try	2 years ago
王子熙	8fad02ab6a	21373493-completed	2 years ago
root	e0bd8532bc	1	2 years ago
buaa21371345	02a9bbad6f	Merge pull request '合并Feature-21371345到dev' (#18 ) from Feature-21371345 into dev	2 years ago
刘栗江	c1f22bfd2e	Fix bug	2 years ago
Your Name	241b0e4814	dev	2 years ago
刘栗江	9b7139493d	bug	2 years ago
刘栗江	71fded503d	Merge branch 'Feature-21371345' into dev	2 years ago
Your Name	3151b2f846	do	2 years ago
刘栗江	ea9a0bb133	?	2 years ago
王子熙	40c4cfcdf1	Merge branch 'dev' of https://bdgit.educoder.net/buaa21371345/BUAA-SE-2023-Lab01-Group19 into Feature-21373493	2 years ago
Your Name	8ac5afb7cb	Merge HEAD, branch 'dev' of https://bdgit.educoder.net/buaa21371345/BUAA-SE-2023-Lab01-Group19 into Feature-21373439	2 years ago
刘栗江	2d8d5c1e62	Merge branch 'Feature-21371345' into dev	2 years ago
root	56ff211596	21371177	2 years ago
Your Name	b866cf8ee2	k	2 years ago
王铮	656d7b2900	1	2 years ago
王子熙	2726d237e4	21373493	2 years ago
刘栗江	cafc4a2f73	Roll back	2 years ago