Commit Graph

34 Commits (master)
 

Author SHA1 Message Date
buaa20241040 55eadcca18 Merge pull request '将傅新峰新分支推送至远程仓库并向 dev 分支发起 Pull Request' (#3) from Feature-20241040 into dev
2 years ago
buaa20241018 bbe88796be Merge pull request '20241018' (#2) from Feature-20241018 into dev
2 years ago
buaa20241032 42ffe6d9e6 Merge pull request '将新分支推送至远程仓库并向 dev 分支发起 Pull Request' (#4) from Feature-20241032 into dev
2 years ago
buaa20241029 7fd28c6e8d 合并Feature-20241029至dev
2 years ago
buaa20241032 cfd8d9e031 在本地的 Feature-学号 分支上修改各自的 Function-学号.py 文件
2 years ago
熊昕然 9ae3c5917e 20241018
2 years ago
fuxinfeng ad056ebd55 20241040
2 years ago
徐天行 d08e77f02e 更改Function-20241029.py文件
2 years ago
熊昕然 4f2f11932f Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev
2 years ago
buaa20241032 1b6559c931 Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev
2 years ago
熊昕然 adf6527418 Conflict Solved
2 years ago
buaa20241032 49c6f920d8 Conflict Solved
2 years ago
吴鑫宇 4432f17902 Conflict Solved
2 years ago
熊昕然 a744b358f1 Merge branch 'Student-20241018' into dev
2 years ago
buaa20241032 557cd95e65 Merge branch 'Student-20241032' into dev
2 years ago
熊昕然 7130514059 在本地将 Student-学号 分支合并到 dev 分支
2 years ago
徐天行 a7549e5fae Merge branch 'Student-20241029' into dev
2 years ago
徐天行 cd91ef205a 添加项目文件
2 years ago
buaa20241032 b91f014303 组员在本地将 Student-学号 分支合并到 dev 分支
2 years ago
徐天行 a2a4e0f3f3 编写main.py
2 years ago
吴鑫宇 46708dc4fb Merge branch 'Student-20241027' into dev
2 years ago
吴鑫宇 283bba4469 change main.py
2 years ago
吴鑫宇 ad867e757a Merge remote-tracking branch 'origin/dev' into dev
2 years ago
熊昕然 6ef9a5213f Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev
2 years ago
fuxinfeng e18403c92e Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev
2 years ago
buaa20241032 e7403e394b Merge branch 'dev' of https://bdgit.educoder.net/buaa20241029/BUAA-SE-2023-Lab01-Group9-remake into dev
2 years ago
fuxinfeng 9d64c8d12b 20241040
2 years ago
buaa20241032 4dfb347803 在本地 Student-20241032 分支添加 Function-学号.py 文件
2 years ago
熊昕然 8a2dcc760d 在本地 Student-学号 分支添加 Function-学号.py 文件
2 years ago
吴鑫宇 55bb3ece0b change Function-20241027.py
2 years ago
吴鑫宇 effd91a64a add Function-20241027.py
2 years ago
徐天行 eb1c183024 创建Function-20241029.py文件
2 years ago
徐天行 78a9a4491d 创建main.py
2 years ago
buaa20241029 fe7df23865 Initial commit
2 years ago