From f24ac0c86462192af188b5b1a5b600d002f3f65d Mon Sep 17 00:00:00 2001
From: carlyin <carlyin@tencent.com>
Date: Fri, 6 Dec 2024 17:38:13 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E6=8F=92=E4=BB=B6=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BD=BF=E7=94=A8=E5=8E=86=E5=8F=B2=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=AE=E5=A4=8D=E6=96=B9=E5=BC=8F=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=86=8D=E7=94=A8=E6=99=AE=E9=80=9A=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=91=E5=B8=83=E7=9A=84=E5=88=86=E6=94=AF=E4=BC=9A?=
 =?UTF-8?q?=E7=BB=A7=E6=89=BF=E4=B8=8A=E4=B8=80=E6=AC=A1=E7=9A=84=20#11301?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tencent/devops/store/pojo/atom/MarketAtomUpdateRequest.kt   | 2 +-
 .../devops/store/atom/service/impl/AtomReleaseServiceImpl.kt    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/MarketAtomUpdateRequest.kt b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/MarketAtomUpdateRequest.kt
index 8c47cc6ad857..145477b496cd 100644
--- a/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/MarketAtomUpdateRequest.kt
+++ b/src/backend/ci/core/store/api-store/src/main/kotlin/com/tencent/devops/store/pojo/atom/MarketAtomUpdateRequest.kt
@@ -73,7 +73,7 @@ data class MarketAtomUpdateRequest(
     @get:Schema(title = "插件字段校验确认标识", required = false)
     val fieldCheckConfirmFlag: Boolean? = false,
     @get:Schema(title = "分支", required = false)
-    val branch: String? = null,
+    var branch: String? = null,
     @get:Schema(title = "是否属于分支测试版本", required = false)
     var isBranchTestVersion: Boolean = false
 )
diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomReleaseServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomReleaseServiceImpl.kt
index 2fa7c86fe295..f001714dd319 100644
--- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomReleaseServiceImpl.kt
+++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/AtomReleaseServiceImpl.kt
@@ -351,6 +351,7 @@ abstract class AtomReleaseServiceImpl @Autowired constructor() : AtomReleaseServ
         val branch = if (marketAtomUpdateRequest.branch.isNullOrBlank() ||
             releaseType != ReleaseTypeEnum.HIS_VERSION_UPGRADE
         ) {
+            marketAtomUpdateRequest.branch = MASTER
             MASTER
         } else {
             marketAtomUpdateRequest.branch