From 14b70bacd63f6b136612cf70b160777142e2a996 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 十月 2024 10:14:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsDTO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsDTO.java b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsDTO.java
index a42e1c3..ed4a700 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseGoodsDTO.java
@@ -38,7 +38,7 @@
private Integer categoryId;
@ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)")
- private Integer categoryName;
+ private String categoryName;
@ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)")
private Integer brandId;
--
Gitblit v1.9.3