From 24a05c3e514e67e2447ec3394dbcc45dd395ea3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E6=9C=88=E8=80=80?= <21371444> Date: Sat, 11 Mar 2023 16:43:27 +0800 Subject: [PATCH 01/11] update README.md --- README.md | 3 +-- main.py | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 main.py diff --git a/README.md b/README.md index 576c717..0547fb0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ -# test - +# BUAA-SE-2023-Lab01-Group13 \ No newline at end of file diff --git a/main.py b/main.py new file mode 100644 index 0000000..068293a --- /dev/null +++ b/main.py @@ -0,0 +1,3 @@ +# main.py 文件的内容修改为 +import os +os.system('python Function-学号.py') \ No newline at end of file From 46ca43a27bda9c19efe6966b1e7ec65dd0d9d8c1 Mon Sep 17 00:00:00 2001 From: XuFuhao <2664366207@qq.com> Date: Sat, 11 Mar 2023 16:47:29 +0800 Subject: [PATCH 02/11] 20375182-9 --- Function-20375182.py | 2 ++ main.py | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 Function-20375182.py diff --git a/Function-20375182.py b/Function-20375182.py new file mode 100644 index 0000000..9a63ac6 --- /dev/null +++ b/Function-20375182.py @@ -0,0 +1,2 @@ +# Function-学号.py 文件的内容修改为 +print('My Student_ID is 20375182') \ No newline at end of file diff --git a/main.py b/main.py index e69de29..fc2c25f 100644 --- a/main.py +++ b/main.py @@ -0,0 +1,3 @@ +# main.py 文件的内容修改为 +import os +os.system('python Function-20375182.py') \ No newline at end of file From 0b5e6038b12d9cb4ceca9f7d54aae431c7b33175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E6=9C=88=E8=80=80?= <21371444> Date: Sat, 11 Mar 2023 17:03:02 +0800 Subject: [PATCH 03/11] 1 --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index fc2c25f..69e4c95 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,3 @@ # main.py 文件的内容修改为 import os -os.system('python Function-20375182.py') \ No newline at end of file +os.system('python Function-21371444.py') \ No newline at end of file From 761c402ad7a84efdb0421d77140a4cac6b0d7edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E6=9C=88=E8=80=80?= <21371444> Date: Sat, 11 Mar 2023 17:03:47 +0800 Subject: [PATCH 04/11] 2 --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 69e4c95..238ab9c 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,3 @@ # main.py 文件的内容修改为 import os -os.system('python Function-21371444.py') \ No newline at end of file +os.system('python Function-21371443.py') \ No newline at end of file From 30310caa7832093aa07a47bcacd66e7b0a1119c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E8=B6=85=E5=87=A1?= <21373104@buaa.edu.cn> Date: Sat, 11 Mar 2023 17:04:37 +0800 Subject: [PATCH 05/11] conflict --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 69e4c95..83fc9f0 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,3 @@ # main.py 文件的内容修改为 import os -os.system('python Function-21371444.py') \ No newline at end of file +os.system('python Function-21373104.py') \ No newline at end of file From 9e8dcf77c40a216431627cb3a37015e311eb94cd Mon Sep 17 00:00:00 2001 From: 20375212zyj <3152632593@qq.com> Date: Sat, 11 Mar 2023 17:05:26 +0800 Subject: [PATCH 06/11] test --- Function-20375212.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 Function-20375212.py diff --git a/Function-20375212.py b/Function-20375212.py new file mode 100644 index 0000000..1bad664 --- /dev/null +++ b/Function-20375212.py @@ -0,0 +1 @@ +print('My Student_ID is 20375212') \ No newline at end of file From 340a82d3dde65fb37d658295cf11885b3dbcabaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E6=9E=97=E6=A5=A0?= <1094620345@qq.com> Date: Sat, 11 Mar 2023 17:13:49 +0800 Subject: [PATCH 07/11] 111 --- Function-20376388.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 Function-20376388.py diff --git a/Function-20376388.py b/Function-20376388.py new file mode 100644 index 0000000..f4c335b --- /dev/null +++ b/Function-20376388.py @@ -0,0 +1 @@ +print('My Student_ID is 20376388') \ No newline at end of file From 58917bf4fb5a7b63e26fd59ba2ff6cd291896649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E6=9C=88=E8=80=80?= <21371444> Date: Sat, 11 Mar 2023 17:26:12 +0800 Subject: [PATCH 08/11] push Feature-21371444 branch --- Function-21371444.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Function-21371444.py b/Function-21371444.py index cb75b44..21c7c69 100644 --- a/Function-21371444.py +++ b/Function-21371444.py @@ -1,2 +1,3 @@ # Function-学号.py 文件的内容修改为 -print('My Student_ID is 21371444') \ No newline at end of file +print('My Student_ID is 23171444') +print('My Name is 曹月耀') \ No newline at end of file From 307b82afb8ae3dd2083fce451727b13691470490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E8=B6=85=E5=87=A1?= <21373104@buaa.edu.cn> Date: Sat, 11 Mar 2023 17:28:42 +0800 Subject: [PATCH 09/11] create feature-21373104 --- Function-21373104.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Function-21373104.py b/Function-21373104.py index 7aab45b..b4e8409 100644 --- a/Function-21373104.py +++ b/Function-21373104.py @@ -1,2 +1,3 @@ # Function-学号.py 文件的内容修改为 -print('My Student_ID is 21373104') \ No newline at end of file +print('My Student_ID is 21373104') +print('My Name is 吕超凡') \ No newline at end of file From 8d76866737e7a900d5b94469d6ff8095693186ad Mon Sep 17 00:00:00 2001 From: XuFuhao <2664366207@qq.com> Date: Sat, 11 Mar 2023 17:31:41 +0800 Subject: [PATCH 10/11] 10 --- Function-20375182.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Function-20375182.py b/Function-20375182.py index 9a63ac6..2b2e7c1 100644 --- a/Function-20375182.py +++ b/Function-20375182.py @@ -1,2 +1,3 @@ # Function-学号.py 文件的内容修改为 -print('My Student_ID is 20375182') \ No newline at end of file +print('My Student_ID is 20375182') +print('My Name is 徐富豪') \ No newline at end of file From 8f942db8c23f910309331d466bac36c3227d24b2 Mon Sep 17 00:00:00 2001 From: 20375212zyj <3152632593@qq.com> Date: Sat, 11 Mar 2023 17:43:04 +0800 Subject: [PATCH 11/11] test --- Function-20375212.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Function-20375212.py b/Function-20375212.py index 1bad664..e7f0242 100644 --- a/Function-20375212.py +++ b/Function-20375212.py @@ -1 +1,2 @@ -print('My Student_ID is 20375212') \ No newline at end of file +print('My Student_ID is 20375212') +print('My name is 张逸君') \ No newline at end of file