From dd9881208fc48263f15fa5659f649602ea6558f8 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Wed, 7 Feb 2024 09:20:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=AA=E5=99=A8=E8=8E=B7=E5=8F=96=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/flossom/common/core/domain/ret/WxModeRet.java | 11 ++++++-----
 .../service/impl/WxInstrumentServiceImpl.java         |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java
index 7cbbdb3..da31e8a 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/ret/WxModeRet.java
@@ -9,6 +9,7 @@ import com.flossom.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -83,9 +84,9 @@ public class WxModeRet {
     /**
      * 模式时长
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "模式时长", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date modeTime;
+    @JsonFormat(pattern = "HH:mm:ss")
+    @Excel(name = "模式时长", width = 30, dateFormat = "HH:mm:ss")
+    private LocalTime modeTime;
 
     /**
      * 准备视频
@@ -218,11 +219,11 @@ public class WxModeRet {
         return isCabinMode;
     }
 
-    public void setModeTime(Date modeTime) {
+    public void setModeTime(LocalTime modeTime) {
         this.modeTime = modeTime;
     }
 
-    public Date getModeTime() {
+    public LocalTime getModeTime() {
         return modeTime;
     }
 
diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
index 6a85bba..a19e0d8 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
@@ -448,6 +448,7 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
             WxModeRet wxModeRet = new WxModeRet();
             BeanUtils.copyProperties(wxMode, wxModeRet);
             wxModeRet.setLock(false);
+            wxModeRet.setModeTime(LocalTime.of(0, 10));
 
             // 查询 模式组合
             WxModeCombineInfo query = new WxModeCombineInfo();