From 2cf783a1480050c0f13907c5fde625edee8fce62 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 七月 2025 16:41:23 +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 | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 9ce17f3..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
@@ -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;
--
Gitblit v1.7.1