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
This commit is contained in:
commit
ee5b471334
@ -1,5 +1,7 @@
|
||||
package cd.casic.ci.process.process.dataObject.pipeline;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
@ -9,6 +11,7 @@ public class PipPipeline {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
/**
|
||||
|
@ -1,5 +1,7 @@
|
||||
package cd.casic.ci.process.process.dataObject.resource;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
@ -9,6 +11,7 @@ public class PipResource {
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String id;
|
||||
|
||||
/**
|
||||
|
@ -1,5 +1,7 @@
|
||||
package cd.casic.ci.process.process.dataObject.task;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import lombok.Data;
|
||||
import org.json.JSONObject;
|
||||
|
||||
@ -8,6 +10,7 @@ import java.time.LocalDateTime;
|
||||
@Data
|
||||
public class PipTask {
|
||||
//@ApiProperty(name="taskId",desc="配置id")
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private String taskId;
|
||||
|
||||
//@ApiProperty(name="createTime",desc="创建时间")
|
||||
|
Loading…
x
Reference in New Issue
Block a user