guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

2024年1月19日V01.00.51 #9

Open
guoyuepeng wants to merge 23 commits from 2024年1月19日V01.00.51 into czks1.0
pull from: 2024年1月19日V01.00.51
merge into: guoyuepeng:czks1.0
Conversation 0 Commits 23 Files Changed 106
guoyuepeng commented 2024-01-21 09:26:51 +08:00
Owner
There is no content yet.
guoyuepeng added 23 commits 2024-01-21 09:26:56 +08:00
a2caf30b90 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/application-dev.properties
#	src/main/resources/application-local.properties
#	src/main/resources/application-master.properties
This pull request has changes conflicting with the target branch.
  • src/main/java/com/zcloud/aspect/DockingAspect.java
  • src/main/java/com/zcloud/controller/map/MapController.java
  • src/main/java/com/zcloud/controller/map/MapEightController.java
  • src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
  • src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java
  • src/main/java/com/zcloud/service/map/MapEightService.java
  • src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java
  • src/main/resources/application-dev.properties
  • src/main/resources/application-local.properties
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 2024年1月19日V01.00.51 czks1.0
git pull origin 2024年1月19日V01.00.51

Step 2:

Merge the changes and update on Gitea.
git checkout czks1.0
git merge --no-ff 2024年1月19日V01.00.51
git push origin czks1.0
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: guoyuepeng/qa-prevention-gwj#9
There is no content yet.
Delete Branch "2024年1月19日V01.00.51"

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?