From 600c11e87bda91b0588ee1636208513917cf6d28 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Thu, 13 Mar 2025 15:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=84=E6=A8=A1=E5=9D=97ts?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/materials/domain/vo/BusMaterialsInventoryVo.java  | 4 ++--
 plus-ui/src/api/machinery/machinery/types.ts                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java
index 815af691..0a489887 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/BusMaterialsInventoryVo.java
@@ -73,14 +73,14 @@ public class BusMaterialsInventoryVo implements Serializable {
      * 剩余库存数量（记录最后一次操作留下的库存数）
      */
     @ExcelProperty(value = "剩余库存数量", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "记=录最后一次操作留下的库存数")
+    @ExcelDictFormat(readConverterExp = "记录最后一次操作留下的库存数")
     private Long residue;
 
     /**
      * 操作人（入库人、领料人）
      */
     @ExcelProperty(value = "操作人", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "入=库人、领料人")
+    @ExcelDictFormat(readConverterExp = "入库人、领料人")
     private String operator;
 
     /**
diff --git a/plus-ui/src/api/machinery/machinery/types.ts b/plus-ui/src/api/machinery/machinery/types.ts
index ed6e92c1..113b354a 100644
--- a/plus-ui/src/api/machinery/machinery/types.ts
+++ b/plus-ui/src/api/machinery/machinery/types.ts
@@ -100,7 +100,7 @@ export interface MachineryQuery extends PageRequest {
 
   /**
    * 备注
-   */1
+   */
   remark?: string;
 
   /**