From 0365eb9f81bd331b0adde6d77fb331213a2c7b30 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 12 五月 2026 13:40:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro
---
src/main/java/com/ruoyi/basic/dto/ProductDto.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductDto.java b/src/main/java/com/ruoyi/basic/dto/ProductDto.java
index 7b38d99..ba6077f 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductDto.java
@@ -9,5 +9,8 @@
@Data
public class ProductDto extends Product {
+ //娴疆鐢ㄤ簬鍖哄垎鎴愬搧鍜岀墿鏂�
+ private String productType;
+
private List<ProductModel> productModelList;
}
--
Gitblit v1.9.3