From eda9fb25d1605399b7f070f860227c57af267af6 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 11 十一月 2022 14:21:30 +0800
Subject: [PATCH] token获取物业id处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java | 4 +++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java
index 9c09205..6eed33c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActProceedingsVO.java
@@ -1,11 +1,12 @@
package com.panzhihua.common.model.vos.community;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.util.Date;
-
+@Data
public class ComActProceedingsVO implements Serializable {
/**
* 主键id
@@ -71,6 +72,7 @@
@ApiModelProperty("工作时间")
private String workTime;
+ private String logo;
private static final long serialVersionUID = 1L;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java
index e3d9ad0..a0b1b63 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java
@@ -16,6 +16,7 @@
import javax.annotation.Resource;
import java.util.Date;
+import java.util.List;
import static java.util.Objects.isNull;
@@ -31,7 +32,8 @@
* */
@Override
public R pageProceedings(Integer page, Integer size, String keyWord) {
- return R.ok(comActProceedingsDao.pageProceedings(new Page(page,size),keyWord));
+ List<ComActProceedingsVO> comActProceedingsVOS = comActProceedingsDao.pageProceedings(new Page(page, size), keyWord);
+ return R.ok(comActProceedingsVOS);
}
/**
--
Gitblit v1.7.1