Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

补充提交了迁移文件 #811

Merged
merged 8 commits into from
Feb 17, 2024
Merged

补充提交了迁移文件 #811

merged 8 commits into from
Feb 17, 2024

Conversation

Morgen-Kornblume
Copy link
Contributor

之前实现空盒元气值补偿时因为第一次做忘了提交迁移文件，现在补充提交

panhongtao07
panhongtao07 requested changes Jan 29, 2024
View reviewed changes
Copy link
Contributor

@panhongtao07 panhongtao07 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

建议删除generic目录下这两个文件并重新makemigrations
此外，如果你的历史与yppf:develop不一致，可能影响未来的提交。现在显示你和上游有7个commit差异，适当注意。

@pkuGenuine pkuGenuine merged commit 68368b2 into Yuanpei-Intelligence:develop Feb 17, 2024
1 check passed
pkuGenuine pushed a commit that referenced this pull request Aug 10, 2024
@Morgen-Kornblume @pkuGenuine
补充提交了迁移文件 (#811)
4802121 
* 实现了空盲盒元气值补偿功能

* 添加对元气值补偿为0情况的特殊处理

* 避免无意义删行

* 补充提交迁移文件

* 补充提交迁移文件

* 重新生成了迁移文件
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@panhongtao07 panhongtao07 panhongtao07 requested changes

@pkuGenuine pkuGenuine pkuGenuine approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Morgen-Kornblume @panhongtao07 @pkuGenuine