Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug:插件最新版本使用历史版本修复方式发布后,再用普通方式发布的分支会继承上一次的 #11301 #11302

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down