BUAA-SE-2023-Lab01-Group9-remake

Commit Graph

Select branches

Hide Pull Requests

Feature-20241018

Feature-20241027

Feature-20241029

Feature-20241032

Feature-20241040

Student-20241018

Student-20241027

Student-20241029

Student-20241032

Student-20241040

dev

master

#1

da05ecd930 Merge branch 'dev' into Feature-20241018 Feature-20241018 熊昕然 2023-03-13 21:08:40 +0800
11cf3e5c3e 同意 buaa20241029 2023-03-13 18:32:34 +0800
19c4d385ac hkjsdaksjadhjk #1 熊昕然 2023-03-13 18:30:29 +0800
d0855205c6 更改main.py 徐天行 2023-03-13 18:29:01 +0800
29df5fa7bf Merge pull request '合并' (#5) from Feature-20241027 into dev dev buaa20241027 2023-03-13 18:19:58 +0800
55eadcca18 Merge pull request '将傅新峰新分支推送至远程仓库并向 dev 分支发起 Pull Request' (#3) from Feature-20241040 into dev master buaa20241040 2023-03-13 18:19:26 +0800
bbe88796be Merge pull request '20241018' (#2) from Feature-20241018 into dev buaa20241018 2023-03-13 18:19:13 +0800
42ffe6d9e6 Merge pull request '将新分支推送至远程仓库并向 dev 分支发起 Pull Request' (#4) from Feature-20241032 into dev buaa20241032 2023-03-13 18:19:08 +0800
7fd28c6e8d 合并Feature-20241029至dev buaa20241029 2023-03-13 18:18:01 +0800
759d031fd5 ch Function-20241027.py Feature-20241027 吴鑫宇 2023-03-13 18:16:30 +0800
cfd8d9e031 在本地的 Feature-学号分支上修改各自的 Function-学号.py 文件 Feature-20241032 buaa20241032 2023-03-13 18:15:54 +0800
9ae3c5917e 20241018 熊昕然 2023-03-13 18:15:50 +0800
ad056ebd55 20241040 Feature-20241040 fuxinfeng 2023-03-13 18:15:44 +0800
4390082174 cha Function-20241027.py 吴鑫宇 2023-03-13 18:15:43 +0800
d08e77f02e 更改Function-20241029.py文件 Feature-20241029 徐天行 2023-03-13 18:15:08 +0800
4f2f11932f Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev 熊昕然 2023-03-13 18:09:24 +0800
1b6559c931 Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev buaa20241032 2023-03-13 18:09:19 +0800
adf6527418 Conflict Solved 熊昕然 2023-03-13 18:09:04 +0800
49c6f920d8 Conflict Solved buaa20241032 2023-03-13 18:07:48 +0800
4432f17902 Conflict Solved 吴鑫宇 2023-03-13 18:02:45 +0800
a744b358f1 Merge branch 'Student-20241018' into dev 熊昕然 2023-03-13 18:01:42 +0800
557cd95e65 Merge branch 'Student-20241032' into dev buaa20241032 2023-03-13 18:00:56 +0800
7130514059 在本地将 Student-学号分支合并到 dev 分支熊昕然 2023-03-13 17:59:44 +0800
a7549e5fae Merge branch 'Student-20241029' into dev 徐天行 2023-03-13 17:59:30 +0800
cd91ef205a 添加项目文件徐天行 2023-03-13 17:59:07 +0800
b91f014303 组员在本地将 Student-学号分支合并到 dev 分支 buaa20241032 2023-03-13 17:58:58 +0800
a2a4e0f3f3 编写main.py 徐天行 2023-03-13 17:58:14 +0800
46708dc4fb Merge branch 'Student-20241027' into dev 吴鑫宇 2023-03-13 17:54:43 +0800
283bba4469 change main.py 吴鑫宇 2023-03-13 17:54:13 +0800
ad867e757a Merge remote-tracking branch 'origin/dev' into dev 吴鑫宇 2023-03-13 17:51:04 +0800
6ef9a5213f Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev 熊昕然 2023-03-13 17:42:12 +0800
e18403c92e Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev fuxinfeng 2023-03-13 17:41:18 +0800
e7403e394b Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev buaa20241032 2023-03-13 17:37:06 +0800
9d64c8d12b 20241040 Student-20241040 fuxinfeng 2023-03-13 17:34:09 +0800
4dfb347803 在本地 Student-20241032 分支添加 Function-学号.py 文件 Student-20241032 buaa20241032 2023-03-13 17:32:32 +0800
8a2dcc760d 在本地 Student-学号分支添加 Function-学号.py 文件 Student-20241018 熊昕然 2023-03-13 17:31:16 +0800
55bb3ece0b change Function-20241027.py Student-20241027 吴鑫宇 2023-03-13 17:31:05 +0800
effd91a64a add Function-20241027.py 吴鑫宇 2023-03-13 17:29:34 +0800
eb1c183024 创建Function-20241029.py文件 Student-20241029 徐天行 2023-03-13 17:28:48 +0800
78a9a4491d 创建main.py 徐天行 2023-03-13 17:11:08 +0800
fe7df23865 Initial commit buaa20241029 2023-03-13 17:06:05 +0800