FiveTeam
/
ShopManage
3
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

FangShiBa #2

Open
FangShiBa wants to merge 0 commits from FangShiBa into master
pull from: FangShiBa
merge into: FiveTeam:master
Conversation 1 Commits - Files Changed -
FangShiBa commented 2023-12-19 14:38:01 +08:00
Owner

购买与售货机商品展示功能

购买与售货机商品展示功能
FangShiBa added 3 commits 2023-12-19 14:38:02 +08:00
FangShiBa commented 2023-12-19 14:39:46 +08:00
Poster
Owner

已阅

已阅
FangShiBa changed title from FangShiBa to FangShiBa 2023-12-19 14:40:21 +08:00
This pull request has changes conflicting with the target branch.
  • .idea/encodings.xml
  • bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java
  • bwie-common/src/main/java/com/bwie/common/pojo/Facility.java
  • bwie-common/src/main/java/com/bwie/common/pojo/Goods.java
  • bwie-common/src/main/java/com/bwie/common/pojo/Shop.java
  • bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java
  • bwie-models/pom.xml
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b FangShiBa master
git pull origin FangShiBa

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff FangShiBa
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: FiveTeam/ShopManage#2
There is no content yet.
Delete Branch "FangShiBa"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?