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

development #3

Merged
cuizhibin merged 41 commits from development into master 2025-08-14 20:04:45 +08:00
Conversation 0 Commits 41 Files Changed 64 +3477 -265
lish commented 2025-08-14 18:01:31 +08:00
Contributor
Copy Link

更新一下服务器中的代码

更新一下服务器中的代码
lish added 41 commits 2025-08-14 18:01:32 +08:00
bd7cf2123e Merge branch 'master' into development 
# Conflicts:
#	core/src/main/java/com/dite/znpt/domain/entity/EquipmentEntity.java
#	core/src/main/java/com/dite/znpt/domain/vo/ProjectTasksDetailResp.java
#	core/src/main/java/com/dite/znpt/service/impl/ProjectTaskServiceImpl.java
#	web/src/main/java/com/dite/znpt/web/controller/ProjectController.java
#	web/src/main/java/com/dite/znpt/web/controller/ProjectTaskController.java
e7df0aa244 Merge branch 'development' of http://pms.dtyx.net:3000/cuizhibin/znpt-backend into development 
# Conflicts:
#	core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java
cuizhibin merged commit 1232ed4eac into master 2025-08-14 20:04:45 +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#3
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?