Pull request #1900: 无JIRA任务 feat: CBB增加分支

Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0

* commit 'fc00df46f295508c84771500d0434c35d31da3f3':
  无JIRA任务 feat: CBB增加分支

build.third_step0.gradle

@@ -71,8 +71,21 @@ configurations {
 	essential
 }
 
-// third的feature对应essential和cbb的release，其他对应master
-String essentialBranch = branchNameUpperCase == 'FEATURE' ? 'RELEASE' : 'MASTER'
+// 主体代码与CBB的对应关系
+String essentialBranch
+switch (branchNameUpperCase) {
+	case "FEATURE":
+	case "RESEARCH":
+		essentialBranch = "FEATURE"
+		break
+	case "RELEASE":
+	case "BUGFIX":
+		essentialBranch = "RELEASE"
+		break
+	default:
+		essentialBranch = "MASTER"
+}
+
 dependencies {
 	essential "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
 	essential "com.fr.cbb:fine-scheduler:1.0-${essentialBranch}-SNAPSHOT"