From 392366ea36a839e5d0ea05968e6da31cd53a9ee6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 27 八月 2025 14:32:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
main-business/src/main/java/com/ruoyi/business/dto/ProductionMasterDto.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/dto/ProductionMasterDto.java b/main-business/src/main/java/com/ruoyi/business/dto/ProductionMasterDto.java
index 7ac7670..4ef8db9 100644
--- a/main-business/src/main/java/com/ruoyi/business/dto/ProductionMasterDto.java
+++ b/main-business/src/main/java/com/ruoyi/business/dto/ProductionMasterDto.java
@@ -10,6 +10,8 @@
@Data
public class ProductionMasterDto extends ProductionMaster {
+ private String searchAll;
+
private List<Production> productionList; //鐢熶骇鏄庣粏
private List<ProductionInventory> productionInventoryList; //浣跨敤搴撳瓨鏄庣粏
--
Gitblit v1.9.3