Merge branch 'sxy' into dev

修改冲突
2025-06-26 17:10:45 +08:00 · 2025-06-26 17:10:29 +08:00
1 changed files with 1 additions and 1 deletions
--- a/internal/logic/bundleLogic.go
+++ b/internal/logic/bundleLogic.go
@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"micro-bundle/internal/dao"
+	"micro-bundle/pb/bundle"
 	"micro-bundle/pkg/app"
 	"micro-bundle/pkg/msg"
 	"time"
@ -14,7 +15,6 @@ import (
 	"gorm.io/gorm"

 	"micro-bundle/internal/model"
-	"micro-bundle/pb/bundle"
 )

 func CreateBundle(req *bundle.BundleProfile) (res *bundle.CommonResponse, err error) {
Author	SHA1	Message	Date
sxy	ea4d3cacd4	Merge branch 'sxy' into dev	2025-06-26 17:10:45 +08:00
sxy	a01be125e6	修改冲突	2025-06-26 17:10:29 +08:00