Merge branch 'dev-mitao'

mitao

2024-05-21 17ecaecf46d5497aec0fcb9d9fcacb8591003285

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/DTO/GoodsBrandDTO.java

File was renamed from ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/mamagement/DTO/GoodsBrandDTO.java
@@ -1,4 +1,4 @@
package com.ruoyi.goods.controller.mamagement.DTO;
package com.ruoyi.goods.controller.management.DTO;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +17,7 @@

    private static final long serialVersionUID = -286811516688205647L;

    @ApiModelProperty(value = "商品品牌标题id", notes = "更新必传，新增不传")
    @ApiModelProperty(value = "商品品牌id", notes = "更新必传，新增不传")
    private Long id;

    @ApiModelProperty(value = "品牌名称")