From 17d65c77c6fedf1b51afec166c5a9735c6e4d38e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 一月 2026 16:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java |    6 ++++++
 1 files changed, 6 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..d2b0ffa 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -192,4 +192,10 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate endDate;
 
+    private Long productModelId;
+
+    @ApiModelProperty(value = "鏄惁鍐荤粨(0:鏈喕缁� 1:宸插喕缁�)")
+    @Excel(name = "鏄惁鍐荤粨")
+    private Boolean isFrozen;
+
 }

--
Gitblit v1.9.3