From 5a72da7fb3e29b735ed0c9ed961ce02a2f730bde Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 11 四月 2026 12:57:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 069b665..9a39ec1 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -39,9 +39,12 @@
/**
* 鍗曚綅
*/
- @Excel(name = "鍗曚綅")
+ @Excel(name = "涓诲崟浣�")
private String unit;
+ @Excel(name = "杈呭崟浣�")
+ private String subUnit;
+
/**
* 鐢熶骇鐐掓満
*/
--
Gitblit v1.9.3