cuizhibin
/
znpt-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并development代码到master #1

Merged
cuizhibin merged 21 commits from development into master 2025-08-11 09:25:53 +08:00
Conversation 0 Commits 21 Files Changed 41 +2545 -1380
cuizhibin commented 2025-08-11 09:21:41 +08:00
Owner
Copy Link
No description provided.
cuizhibin added 21 commits 2025-08-11 09:21:42 +08:00
231faee0d0 Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development 
# Conflicts:
#	core/pom.xml
#	core/src/main/java/com/dite/znpt/domain/entity/BusinessDataEntity.java
#	core/src/main/java/com/dite/znpt/domain/entity/BusinessDataFileEntity.java
#	core/src/main/java/com/dite/znpt/mapper/BusinessDataFileMapper.java
#	core/src/main/java/com/dite/znpt/mapper/BusinessDataMapper.java
#	core/src/main/java/com/dite/znpt/service/BusinessDataFileService.java
#	core/src/main/java/com/dite/znpt/service/BusinessDataService.java
#	core/src/main/java/com/dite/znpt/service/impl/BusinessDataFileServiceImpl.java
#	core/src/main/java/com/dite/znpt/service/impl/BusinessDataServiceImpl.java
#	web/src/main/java/com/dite/znpt/web/controller/BusinessDataFileController.java
cuizhibin merged commit 8a968f1a49 into master 2025-08-11 09:25:53 +08:00
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: cuizhibin/znpt-backend#1
No description provided.
Delete Branch "development"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?