From f417d6b965a16fb197ac8c49b383fbeedd28e23d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 11 九月 2023 15:44:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java | 14 ++++++++++++++
1 files changed, 14 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 bec2415..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;
@@ -8,7 +9,10 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 绱犳潗搴�-鍝佺被淇℃伅琛�
@@ -82,5 +86,15 @@
@ApiModelProperty(value = "鍚嶇О鎷奸煶棣栧瓧姣�")
@ExcelColumn(name="鍚嶇О鎷奸煶棣栧瓧姣�")
private String shortPinyin;
+ @ApiModelProperty(value = "鍔犱环绯绘暟",example = "0")
+ @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