You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
Go to file
djq 70ab42303e
强制使用 develop 分支代码解决冲突,合并 zjp_branch
4 months ago
.idea 强制使用 develop 分支代码解决冲突,合并 zjp_branch 4 months ago
doc 完成合并操作,解决冲突 4 months ago
software-engineering-methodology nch注释 4 months ago
software-engineering-methodology-djq-branch(1) 注释 4 months ago
software-engineering-methodology-djq-branch(2)/software-engineering-methodology 为 forms.py 添加注释 4 months ago
src 完成合并操作,解决冲突 4 months ago
.gitignore 初始化文件,创建src和doc文件夹 5 months ago
26组软件界面说明书.docx 提交信息 4 months ago
FETCH_HEAD 建立src和doc目录,添加初始文件 5 months ago
README.md 解决合并冲突(README.md已处理) 4 months ago
zjp_branch Add zjp_branch 5 months ago

README.md

<<<<<<< HEAD 这是我的个人分支说明

software-engineering-methodology

f783378e06