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_grid/src/main/java/com/panzhihua/service_grid/api/EventApplicationUserNoticeApi.java |   40 ++++++++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApplicationUserNoticeApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApplicationUserNoticeApi.java
index 7641d69..50366f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApplicationUserNoticeApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApplicationUserNoticeApi.java
@@ -1,5 +1,8 @@
 package com.panzhihua.service_grid.api;
 
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.panzhihua.common.model.dtos.grid.EventApplicationUserNoticeAddDTO;
@@ -10,10 +13,8 @@
 import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeDetailsVO;
 import com.panzhihua.common.model.vos.grid.EventApplicationUserNoticeVO;
 import com.panzhihua.service_grid.service.EventApplicationUserNoticeService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  *
@@ -21,63 +22,70 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 @Slf4j
 @RestController
 @RequestMapping("/eventapplicationusernotice")
-public class EventApplicationUserNoticeApi{
+public class EventApplicationUserNoticeApi {
 
     @Resource
     private EventApplicationUserNoticeService eventApplicationUserNoticeService;
 
     /**
      * 新增用户协议和隐私政策信息
+     * 
      * @param eventApplicationUserNoticeAddDTO
      * @return 新增结果
      */
     @PostMapping("/add")
-    R add(@RequestBody EventApplicationUserNoticeAddDTO eventApplicationUserNoticeAddDTO){
+    R add(@RequestBody EventApplicationUserNoticeAddDTO eventApplicationUserNoticeAddDTO) {
         return eventApplicationUserNoticeService.add(eventApplicationUserNoticeAddDTO);
-    };
+    }
 
     /**
      * 修改用户协议和隐私政策信息
+     * 
      * @param eventApplicationUserNoticeEditDTO
      * @return 维护结果
      */
     @PostMapping("/edit")
-    R edit(@RequestBody EventApplicationUserNoticeEditDTO eventApplicationUserNoticeEditDTO){
+    R edit(@RequestBody EventApplicationUserNoticeEditDTO eventApplicationUserNoticeEditDTO) {
         return eventApplicationUserNoticeService.edit(eventApplicationUserNoticeEditDTO);
-    };
+    }
 
     /**
      * 分页查找用户协议和隐私政策信息
+     * 
      * @param pageEventApplicationUserNoticeDTO
      * @return 维护结果
      */
     @PostMapping("/page")
-    R<IPage<EventApplicationUserNoticeVO>> query(@RequestBody PageEventApplicationUserNoticeDTO pageEventApplicationUserNoticeDTO){
+    R<IPage<EventApplicationUserNoticeVO>>
+        query(@RequestBody PageEventApplicationUserNoticeDTO pageEventApplicationUserNoticeDTO) {
         return eventApplicationUserNoticeService.query(pageEventApplicationUserNoticeDTO);
-    };
+    }
 
     /**
      * 删除用户协议和隐私政策信息
+     * 
      * @param EventApplicationUserNoticeDeleteDTO
      * @return 平台用户信息
      */
     @PostMapping("/delete")
-    R delete(@RequestBody EventApplicationUserNoticeDeleteDTO EventApplicationUserNoticeDeleteDTO){
+    R delete(@RequestBody EventApplicationUserNoticeDeleteDTO EventApplicationUserNoticeDeleteDTO) {
         return eventApplicationUserNoticeService.delete(EventApplicationUserNoticeDeleteDTO);
-    };
+    }
 
     /**
      * 查询用户协议和隐私政策信息详细信息
-     * @param id 用户协议和隐私政策信息 id
+     * 
+     * @param id
+     *            用户协议和隐私政策信息 id
      * @return 查找结果
      */
     @PostMapping("/{id}")
-    R<EventApplicationUserNoticeDetailsVO> eventApplicationUserNoticeDetails(@PathVariable("id") Long id){
+    R<EventApplicationUserNoticeDetailsVO> eventApplicationUserNoticeDetails(@PathVariable("id") Long id) {
         return eventApplicationUserNoticeService.eventApplicationUserNoticeDetails(id);
-    };
+    }
 
 }

--
Gitblit v1.7.1