From 1771247044364d5d8ec06cf71d86356c90ec8388 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 15:21:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index a7c5a72..82175f6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -59,10 +59,10 @@
@Excel(name = "浜у搧楂樺害")
private String specificationModel;
// 鍗曚綅
- @Excel(name = "鍗曚綅")
+// @Excel(name = "鍗曚綅")
private String unit;
// 鍚◣鍗曚环
- @Excel(name = "鍗曚环")
+ @Excel(name = "鍗曚环(鍏�)/浠�")
private BigDecimal taxInclusiveUnitPrice;
// 鍚◣鎬讳环
// @Excel(name = "鍚◣鎬讳环")
@@ -138,6 +138,6 @@
/**
* 缇庡厓姣忎欢
*/
- @Excel(name = "缇庡厓姣忎欢")
+ @Excel(name = "鍗曚环(缇庡厓)/浠�")
private BigDecimal dollarPrice;
}
--
Gitblit v1.9.3