From 43698cc4a637e4efb7bf2eac3b520e726964c84e Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Wed, 21 Feb 2024 13:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BF=94=E5=9B=9E=E5=AD=97=E5=85=B8=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/flossom/common/core/domain/entity/WxMode.java  | 6 +++---
 .../java/com/flossom/common/core/domain/ret/WxModeRet.java  | 6 +++---
 flossom-ui/src/views/system/mode/index.vue                  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java
index 741c10d..0ffe33d 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxMode.java
@@ -49,7 +49,7 @@ public class WxMode extends BaseEntity
 
     /** 模式类型(每个仪器有不一样的模式类型) */
     @Excel(name = "模式类型(每个仪器有不一样的模式类型)")
-    private Long modeType;
+    private String modeType;
 
     /** 模式分类(每个仪器有不一样的模式分类) */
     @Excel(name = "模式分类(每个仪器有不一样的模式分类)")
@@ -165,12 +165,12 @@ public class WxMode extends BaseEntity
     {
         return modeVideo;
     }
-    public void setModeType(Long modeType)
+    public void setModeType(String modeType)
     {
         this.modeType = modeType;
     }
 
-    public Long getModeType()
+    public String getModeType()
     {
         return modeType;
     }
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 da31e8a..95867fa 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
@@ -67,7 +67,7 @@ public class WxModeRet {
      * 模式类型(每个仪器有不一样的模式类型)
      */
     @Excel(name = "模式类型(每个仪器有不一样的模式类型)")
-    private Long modeType;
+    private String modeType;
 
     /**
      * 模式分类(每个仪器有不一样的模式分类)
@@ -195,11 +195,11 @@ public class WxModeRet {
         return modeVideo;
     }
 
-    public void setModeType(Long modeType) {
+    public void setModeType(String modeType) {
         this.modeType = modeType;
     }
 
-    public Long getModeType() {
+    public String getModeType() {
         return modeType;
     }
 
diff --git a/flossom-ui/src/views/system/mode/index.vue b/flossom-ui/src/views/system/mode/index.vue
index 1a04700..020bbe9 100644
--- a/flossom-ui/src/views/system/mode/index.vue
+++ b/flossom-ui/src/views/system/mode/index.vue
@@ -181,7 +181,7 @@
         </el-row>
         <el-row>
           <el-col :span ="12">
-            <el-form-item label="舱体模式" prop="isCabinMode" v-if="form.instrumentModel == 'WL200' & form.modeType != 10">
+            <el-form-item label="舱体模式" prop="isCabinMode" v-if="form.instrumentModel == 'WL200' & form.modeType != '10'">
               <el-select v-model="form.isCabinMode">
                 <el-option label="是" :value="1"></el-option>
                 <el-option label="否" :value="0"></el-option>
@@ -189,7 +189,7 @@
             </el-form-item>
           </el-col>
           <el-col :span ="12">
-            <el-form-item label="自定义组合" prop="isCustomMode" v-if="(form.modeType != 10&&form.instrumentType==2)" label-width="100px">
+            <el-form-item label="自定义组合" prop="isCustomMode" v-if="(form.modeType != '10'&&form.instrumentType==2)" label-width="100px">
               <el-select v-model="form.isCustomMode">
                 <el-option label="是" :value="1"></el-option>
                 <el-option label="否" :value="0"></el-option>