From 8ef6cc463ec3e1c7f7164bcfe19c383214cb5db4 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 11 七月 2022 09:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_zts
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index c3d30d2..f3aacc8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -296,7 +296,7 @@
comActActRegistVOS.forEach(activitySignInVO -> {
if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
currentList.add(activitySignInVO);
- if(comActActivityVO.getType()!=3){
+ if(comActActivityVO.getType()!=3&&comActActivityVO.getType()!=5){
comActActivityVO.setIsComment(1);
if(comActActivityVO.getTimes()==null){
comActActivityVO.setTimes(1);
--
Gitblit v1.7.1