From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
index 7f19cc5..957affa 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
@@ -1,18 +1,16 @@
package com.ruoyi.shop.domain.pojo.shop;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotations.Version;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -41,7 +39,7 @@
@TableField("del_flag")
private Integer delFlag;
- @TableField("Shop_id")
+ @TableField("shop_id")
private Long shopId;
/**
* 建议内容
@@ -68,12 +66,38 @@
*/
@TableField("replay_user_id")
private Long replayUserId;
+
+ /**
+ * 回复人姓名
+ */
+ @TableField("replay_user_name")
+ private String replayUserName;
/**
* 回复时间
*/
@TableField("replay_time")
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() {
--
Gitblit v1.7.1