Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp

# Conflicts:
#	modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java

framework/spring-boot-starter-biz-tenant/src/main/java/cd/casic/framework/tenant/config/OpsTenantAutoConfiguration.java

@@ -63,7 +63,7 @@ public class OpsTenantAutoConfiguration {
 
     // ========== WEB ==========
 
-    @Bean
+//    @Bean
     public FilterRegistrationBean<TenantContextWebFilter> tenantContextWebFilter() {
         FilterRegistrationBean<TenantContextWebFilter> registrationBean = new FilterRegistrationBean<>();
         registrationBean.setFilter(new TenantContextWebFilter());

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java

@@ -39,6 +39,9 @@ public class PipStage {
     //@ApiProperty(name = "stageList",desc="阶段")
     @TableField(exist = false)
     private List<PipStage> stageList;
+    // 执行实例id
+    @TableField(exist = false)
+    private String instanceId;
     private LocalDateTime updateTime;
     private Long createUserId;
     private Long updateUserId;