From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 三月 2025 19:58:45 +0800
Subject: [PATCH] 党员、诉求评论基础代码

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchant.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchant.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchant.java
index 9cff332..211e28b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchant.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchant.java
@@ -106,14 +106,12 @@
      * 营业开始时间
      */
     @ApiModelProperty(value = "营业开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date businessStartTime;
+    private String businessStartTime;
     /**
      * 营业结束时间
      */
     @ApiModelProperty(value = "营业结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date businessEndTime;
+    private String businessEndTime;
     /**
      * 活动名称
      */
@@ -152,5 +150,16 @@
     @ApiModelProperty(value = "商家类型名称")
     private String merchantTypeName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "商家评分")
+    private String merchantGrade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "商家商品数量")
+    private String goodNum;
+
+    @ApiModelProperty(value = "商家积分")
+    private String merchantIntegral;
+
 
 }

--
Gitblit v1.7.1