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

huliguo

14 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java

@@ -25,7 +25,6 @@
    @ApiModelProperty(value = "回复内容")
    private String replayContent;


    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;