Conversation
Member
|
@wth Thanks. Since you have added a database table, what is the best way to merge your commit to the master branch? BTW, you should also show me that your changes do work in the next lab. -Hui |
Member
|
@wth Please resolve the conflict. -Hui |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
在Service中添加了对于举报数据的生成、传输和接受并展示的代码
添加了用于记录举报数据的数据库
文章页面添加了举报的按钮
管理员页面添加了显示举报数据div 和一系列删除操作的按钮