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

huliguo

9 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 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;

}