Merge pull request 'test10.2' (#5 ) from Feature-21373457 into dev

Merge pull request 'TRJ-Request' (#6 ) from Feature-21371404 into dev
On branch Feature-21371404
10 changed files with 18 additions and 2 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit f0329e95bc3ac8f27cb65119d3b2e10a1ea846d2
--- a/Function-20374188.py
+++ b/Function-20374188.py
@ -0,0 +1 @@
+print('My Student_ID is 20374188')
--- a/Function-20376345.py
+++ b/Function-20376345.py
@ -0,0 +1 @@
+print("My Student_ID is 20376345")
--- a/Function-21371141.py
+++ b/Function-21371141.py
@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371141')
--- a/Function-21371404.py
+++ b/Function-21371404.py
@ -0,0 +1,2 @@
+print('My Student_ID is 21371404')
+print('My Name is TRJ')
--- a/Function-21373457.py
+++ b/Function-21373457.py
@ -0,0 +1,2 @@
+print('My Student_ID is 21373457')
+print('My Name is 唐鸣宇')
--- a/README.md
+++ b/README.md
@ -1,2 +0,0 @@
-# UAA-SE-2023-Lab01-Group18
-
--- a/main.py
+++ b/main.py
@ -0,0 +1,8 @@
+#<<<<<<< HEAD
+# main.py 文件的内容修改为
+#import os
+#os.system('python Function-20374188.py')
+#=======
+import os
+os.system('python Funtion-21371404.py')
+#>>>>>>> Student-21371404
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 80f3931963293b6069ceafafd45b9ada1f014b20
Author	SHA1	Message	Date
buaa21371404	c1cd326bfa	Merge pull request 'test10.2' (#5 ) from Feature-21373457 into dev	2 years ago
buaa21371404	dcf9bbae4f	Merge pull request 'TRJ-Request' (#6 ) from Feature-21371404 into dev	2 years ago
TRJ	174179e39a	On branch Feature-21371404 Changes to be committed: modified: Function-21371404.py	2 years ago
TRJ	f95f8c158a	Merge branch 'Student-21371404' into dev	2 years ago
TRJ	18ee1ec7b3	On branch Student-21371404 Changes to be committed: new file: Function-21371404.py new file: main.py	2 years ago
Tang Mingyu	8f25ff0c81	test10.2	2 years ago
Tang Mingyu	7cf48417b5	test2	2 years ago
Freeman	6d29fa7c5a	lzm2	2 years ago
Freeman	e6b054c489	lzm1	2 years ago
李子萌	ec81dac5c8	lzm1	2 years ago
罗军忠	742414bb8e	解决冲突	2 years ago
罗军忠	c7072daa5f	提交修改	2 years ago
21371141	f8b101e196	1	2 years ago
21371141	ae302f7c6d	1	2 years ago
21371141	5806109c31	Merge branch 'Student-21371141' into dev	2 years ago
21371141	867080afab	1	2 years ago
21371141	d453ec0ffc	Merge branch 'Student-21371141' into dev	2 years ago
21371141	7bc99bda5f	1	2 years ago
21371141	6d61d4d1f2	21371141	2 years ago
21371141	68682aa0b3	Merge branch 'Student-21371141' into dev	2 years ago
Tang Mingyu	613356a0f7	test	2 years ago
21371141	1ea0b98daf	21371141	2 years ago
21371141	a861957e56	21371141	2 years ago
Tang Mingyu	3703efb9f4	test1	2 years ago
Tang Mingyu	7de7987512	21373457-9.1	2 years ago
buaa21371404	6784190505	Add main.py	2 years ago
				`@ -0,0 +1 @@`
				`Subproject commit f0329e95bc3ac8f27cb65119d3b2e10a1ea846d2`
				`@ -0,0 +1 @@`
				`Subproject commit 80f3931963293b6069ceafafd45b9ada1f014b20`