lpz/intelligent-application-orchestration-service
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

nh #12

Merged
lpz merged 2 commits from nh into main 2025-05-26 10:08:52 +08:00
Conversation 0 Commits 2 Files Changed 12 +553
nh commented 2025-05-25 19:45:28 +08:00
Collaborator
Copy Link
No description provided.
[新增]:新增模型信息管理模块
nh added 2 commits 2025-05-25 19:45:28 +08:00
保留从main分支暂存的所有修改 999fd82ccc 
# Conflicts:
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelDTO.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java
#	src/main/resources/mapper/ModelMapper.xml

# Conflicts:
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelDTO.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java
#	src/main/resources/mapper/ModelMapper.xml
[冲突]:解决合并冲突 9f348280ea 
# Conflicts:
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/constant/MessageConstant.java
#	src/main/resources/application.properties
lpz merged commit bcf44161b5 into main 2025-05-26 10:08:52 +08:00
lpz deleted branch nh 2025-05-26 10:09:01 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something is not working
duplicate
This issue or pull request already exists
enhancement
New feature
help wanted
Need some help
invalid
Something is wrong
question
More information is needed
wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
CindyYu cwq dc hky nh syc wsy lpz
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: lpz/intelligent-application-orchestration-service#12
No description provided.
Delete Branch "nh"

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?