From 893f8cffb39a6c728d231f0f63895388e9a21ae1 Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期三, 02 三月 2022 17:09:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into partyBuilding_lyq

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
index 59d6f4a..b2f6ae4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
@@ -51,11 +51,16 @@
     private Integer status;
 
     /**
-     * 分类类型 1服务类型分类 2技能分类 3通知公告
+     * 分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类
      */
-    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告")
+    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
     private Integer type;
 
     private Long communityId;
 
+    @ApiModelProperty(value = "父类id")
+    private Long parentId;
+
+    @ApiModelProperty("街道id")
+    private Long streetId;
 }

--
Gitblit v1.7.1