diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerCreateReq.java index 80e17a25..423700d0 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerCreateReq.java @@ -16,11 +16,6 @@ public class TargetManagerCreateReq { */ private String targetName; - /** - * 目标图标 - */ - private String targetIcon; - /** * 组织ID */ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerUpdateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerUpdateReq.java index b67a3531..bbd6fbd3 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerUpdateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetManagerUpdateReq.java @@ -21,11 +21,6 @@ public class TargetManagerUpdateReq { */ private String targetName; - /** - * 目标图标 - */ - private String targetIcon; - /** * 组织ID */ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetQueryReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetQueryReq.java index 73560e2e..1e3d7733 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetQueryReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/req/target/TargetQueryReq.java @@ -29,6 +29,11 @@ public class TargetQueryReq extends PageParam { @TableField("target_name") private String targetName; + /** + * 目标类型 + */ + private String targetType; + /** * 创建人用户id */ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetManagerResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetManagerResp.java index 9db50746..d4499a57 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetManagerResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/target/TargetManagerResp.java @@ -21,9 +21,9 @@ public class TargetManagerResp{ private String targetName; /** - * 目标图标 + * 目标类型 */ - private String targetIcon; + private String targetType; /** * 组织ID diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetManager.java index 57021d5d..81358cc7 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetManager.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetManager.java @@ -23,9 +23,9 @@ public class TargetManager extends PipBaseElement { private String targetName; /** - * 目标图标 + * 目标类型 */ - private String targetIcon; + private String targetType; /** * 组织ID diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java index 533b7e65..fa0043bf 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java @@ -22,11 +22,6 @@ public class TargetVersion extends PipBaseElement { */ private String targetId; - /** - * 目标类型 - */ - private String targetType; - /** * 版本号 */ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java index 91c264f1..b0255853 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java @@ -143,6 +143,9 @@ public class TargetManagerServiceImpl extends ServiceImpl