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

huliguo

14 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java

@@ -39,7 +39,7 @@
    @TableField("del_flag")
    private Integer delFlag;

    @TableField("Shop_id")
    @TableField("shop_id")
    private Long shopId;
    /**
     * 建议内容
@@ -66,6 +66,12 @@
     */
    @TableField("replay_user_id")
    private Long replayUserId;

    /**
     * 回复人姓名
     */
    @TableField("replay_user_name")
    private String replayUserName;
    /**
     * 回复时间
     */
@@ -73,11 +79,26 @@
    private Date replayTime;

    /**
     * 响应时间
     */
    @TableField("response_time")
    private String responseTime;

    @TableField("response_timestamp")
    private Long responseTimestamp;

    /**
     * 商品标签
     */
    @TableField("suggest_tags")
    private String suggestTags;

    /**
     * 回复标记
     */
    @TableField("replay_flag")
    private Integer replayFlag;

    @Override
    protected Serializable pkVal() {
        return this.suggestId;