From a2735382e853f89465e328dce2df9f3f465bcda9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 20 九月 2023 17:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/service/src/main/java/com/doumee/dao/business/model/Brand.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Brand.java b/server/service/src/main/java/com/doumee/dao/business/model/Brand.java
index d0c7b77..0869843 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Brand.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Brand.java
@@ -75,6 +75,9 @@
 
     @ApiModelProperty(value = "鍓嶇紑璺緞")
     @TableField(exist = false)
-    private String prefixUrl;
+    private String imgfullurl;
 
+    @ApiModelProperty(value = "鍒嗙被涓婚敭")
+    @TableField(exist = false)
+    private Integer categoryId;
 }

--
Gitblit v1.9.3