From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MainMemberApi.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MainMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MainMemberApi.java
index cabdd12..b806ae6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MainMemberApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MainMemberApi.java
@@ -1,30 +1,26 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.utlis.CopyUtil;
-import com.panzhihua.common.utlis.ValidableList;
-import com.panzhihua.service_community.model.dos.KeyPersonInfoDO;
-import com.panzhihua.service_community.service.KeyPersonInfoService;
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.ValidableList;
+import com.panzhihua.service_community.service.KeyPersonInfoService;
+
+import lombok.extern.slf4j.Slf4j;
import springfox.documentation.annotations.ApiIgnore;
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.List;
-
/**
- * program 攀枝花智慧社区项目
- * description 特殊人群管理API
+ * program 攀枝花智慧社区项目 description 特殊人群管理API
*
- * @author manailin
- * Date 2021-01-22 15:30
+ * @author manailin Date 2021-01-22 15:30
**/
@Slf4j
@RestController
@@ -37,8 +33,9 @@
/**
* description 批量保存重点人群人员信息
*
- * @param list 重点人群信息
- * @return R 保存结果
+ * @param list
+ * 重点人群信息
+ * @return R 保存结果
* @author manailin
* @date 2021/6/10 17:00
*/
--
Gitblit v1.7.1