From 2bb19b8192e4e1e832c48b9f2dfa26ed6708f36c Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Wed, 1 Mar 2023 18:26:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E9=80=9A=E7=9F=A5=E6=89=AB?= =?UTF-8?q?=E8=A1=A8=E5=8F=91=E9=80=81,=E8=A7=A3=E5=86=B3=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/projectlib/handle/AnnualPlanHandle.java | 4 ---- .../ningdatech/pmapi/projectlib/handle/ProjectApprovalHandle.java | 8 -------- .../projectlib/handle/ProjectPreliminaryInspectionHandle.java | 4 ---- .../ningdatech/pmapi/projectlib/handle/TenderPurchaseHandle.java | 4 ---- 4 files changed, 20 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/AnnualPlanHandle.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/AnnualPlanHandle.java index 7994cf3..8253a97 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/AnnualPlanHandle.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/AnnualPlanHandle.java @@ -6,11 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.basic.util.CollUtils; import com.ningdatech.pmapi.common.statemachine.event.ProjectStatusChangeEvent; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; -<<<<<<< HEAD import com.ningdatech.pmapi.projectlib.model.entity.ProjectStatusChange; -======= -import com.ningdatech.pmapi.projectlib.model.entity.NdProjectStatusChange; ->>>>>>> 3fc1952d747d914fc53e00cda93621feed6be50f import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.service.INdProjectStatusChangeService; import com.ningdatech.pmapi.projectlib.service.IProjectService; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectApprovalHandle.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectApprovalHandle.java index e05e5a5..d634354 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectApprovalHandle.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectApprovalHandle.java @@ -10,20 +10,12 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -<<<<<<< HEAD -import com.ningdatech.pmapi.common.constant.CommonConstant; -======= import com.ningdatech.pmapi.common.constant.CommonConst; ->>>>>>> 3fc1952d747d914fc53e00cda93621feed6be50f import com.ningdatech.pmapi.common.statemachine.event.ProjectStatusChangeEvent; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; import com.ningdatech.pmapi.projectlib.enumeration.StepStatusEnum; import com.ningdatech.pmapi.projectlib.manage.AnnualPlanLibManage; -<<<<<<< HEAD import com.ningdatech.pmapi.projectlib.model.entity.ProjectStatusChange; -======= -import com.ningdatech.pmapi.projectlib.model.entity.NdProjectStatusChange; ->>>>>>> 3fc1952d747d914fc53e00cda93621feed6be50f import com.ningdatech.pmapi.projectlib.model.vo.ProcessDetailVO; import com.ningdatech.pmapi.projectlib.service.INdProjectStatusChangeService; import com.ningdatech.pmapi.projectlib.service.IProjectService; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectPreliminaryInspectionHandle.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectPreliminaryInspectionHandle.java index 943f876..9d1e8a1 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectPreliminaryInspectionHandle.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectPreliminaryInspectionHandle.java @@ -14,11 +14,7 @@ import com.ningdatech.pmapi.common.constant.CommonConst; import com.ningdatech.pmapi.common.statemachine.event.ProjectStatusChangeEvent; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; import com.ningdatech.pmapi.projectlib.enumeration.StepStatusEnum; -<<<<<<< HEAD import com.ningdatech.pmapi.projectlib.model.entity.ProjectStatusChange; -======= -import com.ningdatech.pmapi.projectlib.model.entity.NdProjectStatusChange; ->>>>>>> 3fc1952d747d914fc53e00cda93621feed6be50f import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.model.vo.ProcessDetailVO; import com.ningdatech.pmapi.projectlib.service.INdProjectStatusChangeService; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/TenderPurchaseHandle.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/TenderPurchaseHandle.java index b73af77..e5dbb08 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/TenderPurchaseHandle.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/TenderPurchaseHandle.java @@ -13,11 +13,7 @@ import com.ningdatech.pmapi.common.constant.CommonConst; import com.ningdatech.pmapi.common.statemachine.event.ProjectStatusChangeEvent; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; import com.ningdatech.pmapi.projectlib.enumeration.StepStatusEnum; -<<<<<<< HEAD import com.ningdatech.pmapi.projectlib.model.entity.ProjectStatusChange; -======= -import com.ningdatech.pmapi.projectlib.model.entity.NdProjectStatusChange; ->>>>>>> 3fc1952d747d914fc53e00cda93621feed6be50f import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.model.vo.ProcessDetailVO; import com.ningdatech.pmapi.projectlib.service.INdProjectStatusChangeService;