Merge remote-tracking branch 'origin/dev' into Student-22210102

git update-ref -d MERGE_HEAD#
01
5 changed files with 6 additions and 4 deletions
--- a/Function-22210101.py
+++ b/Function-22210101.py
@ -1,2 +1,2 @@
 # Function-学号.py 文件的内容修改为
-print('My Student_ID is 22210116')
+print('My Student_ID is 22210101')
--- a/Function-22210102.py
+++ b/Function-22210102.py
@ -0,0 +1 @@
+print('My Student_ID is 22210102')
--- a/Function-22210104.py
+++ b/Function-22210104.py
@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 22210104')
--- a/Function22210116.py
+++ b/Function22210116.py
@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 学号')
--- a/main.py
+++ b/main.py
@ -1,3 +0,0 @@
-# main.py 文件的内容修改为
-import os
-os.system('python Function-22210116.py')
Author	SHA1	Message	Date
JiangYao	463e883193	Merge remote-tracking branch 'origin/dev' into Student-22210102 git update-ref -d MERGE_HEAD#	2 years ago
JiangYao	3dbc79c199	01	2 years ago
JiangYao	53c463759d	0	2 years ago
root	cf0ef94286	cconflict	2 years ago
JiangYao	35ee83781b	22210102	2 years ago
王泽宇	2ae34d591d	Merge branch 'Student-22210104' into dev	2 years ago
王泽宇	4126549923	王泽宇-9.2.8	2 years ago
王泽宇	b0ec0a6f40	Merge branch 'Student-22210104' into dev	2 years ago
王泽宇	973be809bf	王泽宇-9.2.5	2 years ago
邢嘉琪	67cb4a917f	add Function-22210101	2 years ago