From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java
index 27fc504..f9aa29e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java
@@ -52,7 +52,7 @@
* 创建人id
*/
@TableField("create_user_id")
- private Integer createUserId;
+ private Long createUserId;
/**
* 回复内容
*/
@@ -62,17 +62,31 @@
* 回复用户id
*/
@TableField("replay_user_id")
- private Integer replayUserId;
+ 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;
+ /**
* 商户id
*/
@TableField("shop_id")
- private Integer shopId;
+ private Long shopId;
/**
* 商品标签
@@ -80,6 +94,12 @@
@TableField("suggest_tags")
private String suggestTags;
+ /**
+ * 回复标记
+ */
+ @TableField("replay_flag")
+ private Integer replayFlag;
+
@Override
protected Serializable pkVal() {
return this.suggestId;
--
Gitblit v1.7.1