From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java
index 661cfb4..d897045 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java
@@ -9,6 +9,7 @@
 import com.panzhihua.common.model.dtos.property.CommonPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import com.panzhihua.common.utlis.Snowflake;
 import com.panzhihua.service_community.entity.ComActSocialProject;
 import com.panzhihua.service_community.service.ComActSocialProjectService;
 import org.springframework.beans.BeanUtils;
@@ -73,6 +74,7 @@
     public R insert(@RequestBody SocialProjectVO socialProjectVO) {
         ComActSocialProject comActSocialProject=new ComActSocialProject();
         BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
+//        comActSocialProject.setId(Snowflake.getId());
         comActSocialProject.setCreateTime(new Date());
         if(socialProjectVO.getLevel()>1){
             ComActSocialProject comActSocialProject1=comActSocialProjectService.getById(socialProjectVO.getParentId());

--
Gitblit v1.7.1