mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java
This commit is contained in:
even 2025-05-15 18:33:02 +08:00
commit ee5b471334
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java
View File

@ -1,5 +1,7 @@
package cd.casic.ci.process.process.dataObject.pipeline; package cd.casic.ci.process.process.dataObject.pipeline;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -9,6 +11,7 @@ public class PipPipeline {
/** /**
* 主键id * 主键id
*/ */
@TableId(type = IdType.ASSIGN_ID)
private String id; private String id;
/** /**

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/resource/PipResource.java
View File

@ -1,5 +1,7 @@
package cd.casic.ci.process.process.dataObject.resource; package cd.casic.ci.process.process.dataObject.resource;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -9,6 +11,7 @@ public class PipResource {
/** /**
* 主键id * 主键id
*/ */
@TableId(type = IdType.ASSIGN_ID)
private String id; private String id;
/** /**

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java
View File

@ -1,5 +1,7 @@
package cd.casic.ci.process.process.dataObject.task; package cd.casic.ci.process.process.dataObject.task;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data; import lombok.Data;
import org.json.JSONObject; import org.json.JSONObject;
@ -8,6 +10,7 @@ import java.time.LocalDateTime;
@Data @Data
public class PipTask { public class PipTask {
//@ApiProperty(name="taskId",desc="配置id") //@ApiProperty(name="taskId",desc="配置id")
@TableId(type = IdType.ASSIGN_ID)
private String taskId; private String taskId;
//@ApiProperty(name="createTime",desc="创建时间") //@ApiProperty(name="createTime",desc="创建时间")