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/BaseGoodsDTO.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 8a09393..a42e1c3 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
@@ -25,7 +25,7 @@
@ApiModelProperty(value = "鍚嶇О锛堜笉鍙噸澶嶏級")
private String name;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
@ApiModelProperty(value = "鍥炬爣")
@@ -34,22 +34,22 @@
@ApiModelProperty(value = "鍥炬爣")
private String imgfullurl;
- @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)")
private Integer categoryId;
- @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)")
private Integer categoryName;
- @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
+ @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)")
private Integer brandId;
- @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
- private Integer brandName;
+ @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)")
+ private String brandName;
- @ApiModelProperty(value = "鎸囧浠凤紙鍏冿級", example = "1")
+ @ApiModelProperty(value = "鎸囧浠凤紙鍏冿級")
private BigDecimal zdPrice;
- @ApiModelProperty(value = "鍏ユ墜浠锋牸锛堝厓锛�", example = "1")
+ @ApiModelProperty(value = "鍏ユ墜浠锋牸锛堝厓锛�")
private BigDecimal price;
@ApiModelProperty(value = "鍟嗗搧璇︽儏")
--
Gitblit v1.9.3