From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 f82766f..09bf1b9 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
@@ -1,15 +1,17 @@
package com.panzhihua.common.model.vos.community;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
import com.google.common.collect.Lists;
import com.panzhihua.common.validated.AddGroup;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.List;
/**
* @auther llming
@@ -31,6 +33,12 @@
@Length(groups = {AddGroup.class}, max = 5000)
private String content;
+ @ApiModelProperty("所属分类")
+ private Integer classify;
+
+ @ApiModelProperty("所属分类名称")
+ private String classifyName;
+
@ApiModelProperty("办理时间")
private String timeAt;
@@ -49,5 +57,7 @@
@ApiModelProperty("纬度")
private String lat;
+ private String areaCode;
+
private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}
--
Gitblit v1.7.1