Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-06 beeda8df0023376dbb2021148a021731dc4aedb0

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopSuggestDto.java

@@ -16,7 +16,7 @@
@Data
public class MerShopSuggestDto extends MerBaseDto {

    @ApiModelProperty(name = "建议内容")
    @ApiModelProperty(value = "建议内容")
    private String suggestContent;

}