From 64f45c75ea93911b9841bf00bb4c436cd294be3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 18:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
index 3b1a6f0..93ee05f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +12,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 绱犳潗搴�-鍝佺被淇℃伅琛�
@@ -88,4 +90,11 @@
@ExcelColumn(name="鍔犱环绯绘暟")
private BigDecimal priceRate;
+ @ApiModelProperty(value = "鍥炬爣 鍏ㄨ矾寰�")
+ @TableField(exist = false)
+ private String imgfullurl;
+
+ @ApiModelProperty(value = "鍝佺被鍙傛暟")
+ @TableField(exist = false)
+ private List<BaseCateParam> baseCateParamList;
}
--
Gitblit v1.9.3