From acc80d900b2407a746ddc94f23b678c9e758623c Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Mon, 4 Mar 2024 16:46:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?3.4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sgzb-ui/src/views/stquery/deviceStatusRecord.vue | 15 ++++++++-------
sgzb-ui/vue.config.js | 4 ++--
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
index c848e087..bf3ebdd1 100644
--- a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
+++ b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
@@ -76,11 +76,6 @@
查询
重置
-
-
-
-
-
+
+
+
+
Date: Mon, 4 Mar 2024 18:17:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/base/MaMachineMapper.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
index 52c63d43..3a32a35a 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -300,7 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select * from ma_machine where ma_id = #{maId} and ma_code = #{maCode}