From 66e4211cbfa154a87390b25c93b32d722e0d690c Mon Sep 17 00:00:00 2001
From: xiang <5914123@qq.com>
Date: 星期四, 14 九月 2023 15:22:37 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
index c769fbb..5e1d2cd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
@@ -21,7 +21,7 @@
 @ApiModel("办事指南")
 public class ComActWorkGuideVO {
     @ApiModelProperty("办事指南id")
-    private Long id;
+    private String id;
 
     @ApiModelProperty("办事指南标题")
     @NotBlank(groups = {AddGroup.class}, message = "标题不能为空")
@@ -32,6 +32,12 @@
     @NotBlank(groups = {AddGroup.class}, message = "内容不能为空")
     @Length(groups = {AddGroup.class}, max = 5000)
     private String content;
+
+    @ApiModelProperty("所属分类")
+    private String classify;
+
+    @ApiModelProperty("所属分类名称")
+    private String classifyName;
 
     @ApiModelProperty("办理时间")
     private String timeAt;
@@ -51,5 +57,7 @@
     @ApiModelProperty("纬度")
     private String lat;
 
+    private String areaCode;
+
     private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
 }

--
Gitblit v1.7.1