From e452e21c71d308f6129192b850e3bfd908957cba Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Tue, 30 May 2023 14:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E6=8D=A2eleepdpqd=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/harmonic/pojo/po/EleEpdPqd.java  | 46 -------------------
 .../njcn/harmonic/mapper/EleEpdMapper.java    |  2 +-
 .../service/impl/CustomReportServiceImpl.java |  2 +-
 3 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/EleEpdPqd.java

diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/EleEpdPqd.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/EleEpdPqd.java
deleted file mode 100644
index bd2f8424b..000000000
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/EleEpdPqd.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.njcn.harmonic.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2022/3/14 19:57
- */
-@Data
-@TableName("ele_epd_pqd_copy")
-public class EleEpdPqd implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    private String name;
-
-    private String otherName;
-
-    private String showName;
-
-    private Integer sort;
-
-    private String type;
-
-    private String phase;
-
-    private String unit;
-
-    private Integer harmStart;
-
-    private Integer harmEnd;
-
-    private String classId;
-
-    private String statMethod;
-
-    private String systemType;
-}
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/EleEpdMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/EleEpdMapper.java
index f59f46a8c..a94b7fff6 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/EleEpdMapper.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/EleEpdMapper.java
@@ -2,7 +2,7 @@ package com.njcn.harmonic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import com.njcn.harmonic.pojo.po.EleEpdPqd;
+import com.njcn.system.pojo.po.EleEpdPqd;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
index c987492b2..3cee4988b 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
@@ -20,7 +20,7 @@ import com.njcn.harmonic.mapper.ExcelRptTempMapper;
 import com.njcn.harmonic.pojo.dto.ReportTemplateDTO;
 import com.njcn.harmonic.pojo.param.ReportSearchParam;
 import com.njcn.harmonic.pojo.param.ReportTemplateParam;
-import com.njcn.harmonic.pojo.po.EleEpdPqd;
+import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.harmonic.pojo.po.ExcelRpt;
 import com.njcn.harmonic.pojo.po.ExcelRptTemp;
 import com.njcn.harmonic.pojo.po.SysDeptTemp;