From 7992a76b4dd0c415e443ae898857c6ffdf870b4c Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 10 九月 2021 18:46:36 +0800
Subject: [PATCH] 添加merge缺失包

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
index f7316ca..560ee60 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
@@ -18,13 +18,6 @@
 
 import javax.annotation.Resource;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.panzhihua.common.constants.Constants;
-import com.panzhihua.common.exceptions.ServiceException;
-import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
-import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
-import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.utlis.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.redis.connection.StringRedisConnection;
 import org.springframework.data.redis.core.RedisCallback;
@@ -36,10 +29,13 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.exceptions.ServiceException;
 import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
 import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
 import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
@@ -49,6 +45,8 @@
 import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
 import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
@@ -56,6 +54,7 @@
 import com.panzhihua.common.model.vos.community.ComActDiscussOptionVO;
 import com.panzhihua.common.model.vos.community.ComActDiscussVO;
 import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.model.vos.community.SysConfVO;
 import com.panzhihua.common.model.vos.community.screen.work.DiscussListVO;
 import com.panzhihua.common.service.user.UserService;
 import com.panzhihua.common.utlis.DateUtils;
@@ -65,12 +64,14 @@
 import com.panzhihua.service_community.dao.ComActDiscussOptionDAO;
 import com.panzhihua.service_community.dao.ComActDiscussOptionUserDAO;
 import com.panzhihua.service_community.dao.ComActDiscussUserDAO;
+import com.panzhihua.service_community.dao.SysConfMapper;
 import com.panzhihua.service_community.model.dos.ComActDiscussCommentDO;
 import com.panzhihua.service_community.model.dos.ComActDiscussCommentUserDO;
 import com.panzhihua.service_community.model.dos.ComActDiscussDO;
 import com.panzhihua.service_community.model.dos.ComActDiscussOptionDO;
 import com.panzhihua.service_community.model.dos.ComActDiscussOptionUserDO;
 import com.panzhihua.service_community.model.dos.ComActDiscussUserDO;
+import com.panzhihua.service_community.model.dos.SysConfDO;
 import com.panzhihua.service_community.service.ComActDiscussOptionService;
 import com.panzhihua.service_community.service.ComActDiscussService;
 import com.panzhihua.service_community.service.SysConfService;

--
Gitblit v1.7.1