From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 18 ++----------------
1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 89aa64e..1d06eb6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -161,22 +161,6 @@
*/
@Excel(name = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
-
- /**
- * 姣忕鏁伴噺
- */
- @Excel(name = "姣忕鏁伴噺")
- private Integer boxNum;
- /**
- * 姣忕瑙勬牸
- */
- @Excel(name = "姣忕瑙勬牸")
- private String cartonSpecifications;
- /**
- * 缇庡厓姣忎欢
- */
- @Excel(name = "缇庡厓姣忎欢")
- private BigDecimal dollarPrice;
/**
* 鎶ヨ〃鏃ユ姤
*/
@@ -208,4 +192,6 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate;
+ private Long productModelId;
+
}
--
Gitblit v1.9.3