From 9fcc81fbac58038312b091086d0799cf8562791d Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Sun, 13 Jul 2025 15:27:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE-=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java | 6 +++---
 .../resources/mapper/ems/EmsStrategyTimeConfigMapper.xml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java
index 9bb2f52..1cf9f9f 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java
@@ -41,7 +41,7 @@ public class EmsStrategyTempTimeConfig extends BaseEntity
 
     /** 模板id */
     @Excel(name = "模板id")
-    private Long  templateId;
+    private String  templateId;
 
     public void setId(Long id)
     {
@@ -93,12 +93,12 @@ public class EmsStrategyTempTimeConfig extends BaseEntity
         return chargeStatus;
     }
 
-    public void setTemplateId(Long  templateId)
+    public void setTemplateId(String  templateId)
     {
         this.templateId = templateId;
     }
 
-    public Long  getTemplateId()
+    public String  getTemplateId()
     {
         return templateId;
     }
diff --git a/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml
index 397ae7a..dd01db4 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml
@@ -95,7 +95,7 @@
     </delete>
 
     <select id="getStrategyTimeList" parameterType="EmsStrategyTimeConfig" resultType="com.xzzn.ems.domain.vo.StrategyTimeConfigVo">
-        select  t.id,
+        select  distinct t.id,
                 t.month,
                 t.charge_discharge_mode as chargeDischargeMode,
                 t.template_id as templateId,