From 09394848ce262aff81897503d32ec334fd3f2b6f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 20 一月 2026 15:59:30 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

---
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index a23002a..6dc2f2b 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -23,6 +23,11 @@
     private Long createUser;
 
     /**
+     * true:鍘绘帀鍓╀綑搴撳瓨涓�0
+     */
+    private Boolean flag;
+
+    /**
      * 鍏ュ簱绫诲瀷 1-閲囪喘 2-鐢熶骇
      */
     private Integer type;
@@ -192,4 +197,6 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate endDate;
 
+    private Long productModelId;
+
 }

--
Gitblit v1.9.3