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/dto/BaseCategoryRequest.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java
index d326bcc..86fc24a 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/dto/BaseCategoryRequest.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -30,10 +31,10 @@
@ApiModelProperty(value = "灞炴��2鍚嶇О")
private String attrSecond;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
- @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
+ @ApiModelProperty(value = "鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "鍥炬爣")
@@ -45,6 +46,9 @@
@ApiModelProperty(value = "鍚嶇О鎷奸煶棣栧瓧姣�")
private String shortPinyin;
+ @ApiModelProperty(value = "鍔犱环绯绘暟",example = "0")
+ private BigDecimal priceRate;
+
@ApiModelProperty(value = "鍙傛暟灞炴�ч厤缃�")
List<BaseCategoryRequestParam> baseCategoryRequestParamList;
--
Gitblit v1.9.3