Merge remote-tracking branch 'origin/dev' into dev

k94314517

2023-09-15 64f45c75ea93911b9841bf00bb4c436cd294be3a

 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;

/**
@@ -45,6 +46,9 @@
    @ApiModelProperty(value = "名称拼音首字母")
    private String shortPinyin;

    @ApiModelProperty(value = "加价系数",example = "0")
    private BigDecimal priceRate;

    @ApiModelProperty(value = "参数属性配置")
    List<BaseCategoryRequestParam> baseCategoryRequestParamList;