From e97b55310155a2dd691bd698a10295a4d867f60c Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 17 四月 2026 15:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-plus-soybean/src/typings/api/qm.batch.api.d.ts |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/ruoyi-plus-soybean/src/typings/api/qm.batch.api.d.ts b/ruoyi-plus-soybean/src/typings/api/qm.batch.api.d.ts
old mode 100644
new mode 100755
index 30b532f..97572b6
--- a/ruoyi-plus-soybean/src/typings/api/qm.batch.api.d.ts
+++ b/ruoyi-plus-soybean/src/typings/api/qm.batch.api.d.ts
@@ -24,6 +24,8 @@
       eqpCode: string;
       /** 鐗屽彿 */
       matCode: string;
+      /** 鐗屽彿 */
+      matName: string;
       /** 鍒ゅ畾渚濇嵁浠g爜 */
       judgeCode: string;
       /** 鎵规鐢熸垚鏃ユ湡 */
@@ -112,7 +114,19 @@
     type BatchSearchParams = CommonType.RecordNullable<
       Pick<
         Api.Qm.Batch,
-        'batchCode' | 'typ' | 'eqpCode' | 'matCode' | 'batchDate' | 'flag' | 'deleted' | 'category' | 'state'
+        | 'batchCode'
+        | 'isflag'
+        | 'typ'
+        | 'eqpCode'
+        | 'matCode'
+        | 'batchDate'
+        | 'flag'
+        | 'toMesDate'
+        | 'fromMesDate'
+        | 'enabled'
+        | 'deleted'
+        | 'category'
+        | 'state'
       > &
         Api.Common.CommonSearchParams
     >;

--
Gitblit v1.9.3