Merge branch 'sxy' into dev

internal/dao/valueAddBundleDao.go

@@ -175,7 +175,7 @@ func BatchValueAddServiceDetailTx(tx *gorm.DB, uids []string) (map[string]*model
 	}
 	var results []*model.ValueAddService
 	err := tx.Model(&model.ValueAddService{}).
-		Where("value_uid IN ? AND deleted_at = 0", uids).
+		Where("uuid IN ? AND deleted_at = 0", uids).
 		Preload("ValueAddServiceLang", "deleted_at = 0").
 		Find(&results).Error
 	if err != nil {

internal/logic/bundleLogic.go

@@ -215,7 +215,7 @@ func SaveBundle(req *bundle.BundleProfile) (res *bundle.SaveResponse, err error)
 	} else { // 已存在，进行更新
 
 		// 更新前保存历史记录
-		if saveErr := saveBundleHistory(tx, req.Uuid, "", 0); err != nil {
+		if saveErr := saveBundleHistory(tx, req.Uuid, "", 0); saveErr != nil {
 			return res, saveErr
 		}