Compare commits

...

62 Commits

Author SHA1 Message Date
buaa21373067 3cd0e2bbba Merge pull request 'feature-21371396与dev二次合并申请(main.py修改为了组长的学号)' (#15) from buaa21371396/Group11:Feature-21371396 into dev
2 years ago
buaa21371396 50b2f04e5f 1.3.7
2 years ago
buaa21371396 ded818c648 1.3.7
2 years ago
buaa21373067 e6e57349e5 Merge pull request 'feature-21371396与dev合并申请' (#11) from buaa21371396/Group11:Feature-21371396 into dev
2 years ago
buaa21371396 5b4b5213b9 3.4
2 years ago
buaa20231159 883213ab50 Merge pull request 'zzc_request' (#9) from buaa20231159/Group11:Feature-20231159 into dev
2 years ago
Gabriel1159 13e5a756c6 0313
2 years ago
buaa21373067 3001a2c031 Merge pull request '10-3-5-yhf' (#8) from Feature-21373067 into dev
2 years ago
AlpaCa 043690a861 10.3.5
2 years ago
Gabriel1159 0c35dd5f48 0313-2
2 years ago
Gabriel1159 3ffcd053fd 0313
2 years ago
Gabriel1159 593176b4c2 Conflict Solved
2 years ago
buaa21371396 f47b45257e ConflictSolved
2 years ago
buaa21371396 16d8332db8 ...
2 years ago
buaa21371396 9e6964f0a7 ..
2 years ago
buaa21371396 8db4b70d29 change
2 years ago
buaa21371396 3f017f2865 .
2 years ago
AlpaCa 1cd627e2d1 Confilict Solved
2 years ago
buaa21373067 db0f741b36 Merge pull request '将新分支推送至远程仓库并向 dev 分支发起 Pull Request' (#2) from Feature-21371101 into dev
2 years ago
buaa21373067 b770be9409 Merge pull request '10-4-yhf' (#3) from Feature-21373067 into dev
2 years ago
AlpaCa 27ead23f91 10-4-yhf
2 years ago
zhr 712b367fcf try
2 years ago
陶佑鹏 6bbad6a97f add Feature-21373081
2 years ago
AlpaCa 76d3020b09 Conflict Solved
2 years ago
zhr d6195402ca Conflict Solved
2 years ago
zhr d4b11980de test
2 years ago
zhr 05e6efade4 Merge branch 'Student-21371101' into dev
2 years ago
zhr 007572a898 ttest
2 years ago
AlpaCa 8b5cf10474 solve
2 years ago
buaa21371396 592674905e 21371396
2 years ago
buaa21371396 0bb6a6d16d .
2 years ago
buaa21371396 4a036e8473 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev
2 years ago
buaa21371396 2aa55d3ce0 change py
2 years ago
zhr 6005b0eb18 test
2 years ago
zhr d4620e5241 test
2 years ago
陶佑鹏 48f436391b Merge branch 'student-21373081' into dev
2 years ago
buaa21371396 20ef287cd2 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev
2 years ago
buaa21371396 2b72727ab6 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev
2 years ago
AlpaCa 148affa07a Merge branch 'Student-21373067' into dev
2 years ago
陶佑鹏 ae11e191bf 213730812137308121373081213730812137308121373081213730812137308121373081213730812137308121373081213730812137308121373081213730812137308121373081213730812137308121373081
2 years ago
buaa21371396 1fb103beb7 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev
2 years ago
Gabriel1159 d7005f2172 Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev
2 years ago
Gabriel1159 ef52172d0f Merge branch 'Student-20231159' into dev
2 years ago
zhr 044b522a8d Merge branch 'Student-21371101' into dev
2 years ago
Gabriel1159 8274272691 asd
2 years ago
zhr 4ffdbd0bfd 2
2 years ago
zhr 25fdfce40b Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev
2 years ago
buaa21371396 8b2bfea65a Merge branch 'Student-21371396' into dev
2 years ago
buaa21371396 22722225f3 修改py文件
2 years ago
buaa21371396 0a665f79b7 Merge branch 'Student-21371101' into dev
2 years ago
Gabriel1159 dee9fa840d Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev
2 years ago
zhr 2cbf3159de Merge branch 'Student-21371101' into dev
2 years ago
zhr 81c2e401a8 1
2 years ago
buaa21371396 8f51826958 添加.py文件
2 years ago
AlpaCa cd4224b47c 8-yhf
2 years ago
Gabriel1159 34d53079a8 Merge branch 'student-21373081' of https://bdgit.educoder.net/buaa21373067/Group11 into Student-20231159
2 years ago
AlpaCa a2eb2df8e1 Merge branch 'Student-21373067' into dev
2 years ago
Gabriel1159 c9a3d44ea6 Merge branch 'Student-21371396' of https://bdgit.educoder.net/buaa21373067/Group11 into Student-20231159
2 years ago
buaa21371396 437cf3c8e2 shj
2 years ago
AlpaCa b12fad4ba7 5-yhf
2 years ago
AlpaCa ef29c54be2 5-yhf
2 years ago
AlpaCa 69da94e654 2
2 years ago

@ -0,0 +1,3 @@
# encoding:utf-8
print('My Student_ID is 20231159')
print('My Name is 赵子璁')

@ -0,0 +1,2 @@
print('My Student_ID is 21371101')
print('My Name is 张昊然')

@ -0,0 +1,3 @@
# Function-学号.py 文件的内容修改为
print('My Student_ID is 21371396')
print('My Name is 孙宇航')

@ -0,0 +1,2 @@
print('My Student_ID is 21373067')
print('My Name is 杨宏飞')

@ -1,2 +1,3 @@
#Function-21373081.py 文件的内容修改为
# Function-学号.py 文件的内容修改为
print('My Student_ID is 21373081')
print('My Name is 陶佑鹏')

@ -1,2 +1,3 @@
# Group11
bdsjdkop

@ -1,3 +1,3 @@
# main.py 文件的内容修改为
import os
os.system('python Function-21373081.py')
os.system('python Function-21373067.py')
os.system('echo Feature-21373067')

Loading…
Cancel
Save