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/EasyPhotoClassifyApi.java |   41 +++++++++++++++++++++++++++--------------
 1 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EasyPhotoClassifyApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EasyPhotoClassifyApi.java
index 3e6996c..b6a7526 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EasyPhotoClassifyApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EasyPhotoClassifyApi.java
@@ -1,12 +1,14 @@
 package com.panzhihua.service_community.api;
 
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
 import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_community.service.ComActEasyPhotoClassifyService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @RestController
@@ -18,8 +20,10 @@
 
     /**
      * 运营后台-新增随手拍分类
-     * @param addPhotoClassify  请求参数
-     * @return  新增结果
+     * 
+     * @param addPhotoClassify
+     *            请求参数
+     * @return 新增结果
      */
     @PostMapping("/admin/add")
     public R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
@@ -28,8 +32,10 @@
 
     /**
      * 运营后台-编辑随手拍分类
-     * @param addPhotoClassify  请求参数
-     * @return  编辑结果
+     * 
+     * @param addPhotoClassify
+     *            请求参数
+     * @return 编辑结果
      */
     @PostMapping("/admin/edit")
     public R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
@@ -38,8 +44,10 @@
 
     /**
      * 运营后台-随手拍分类详情
-     * @param id    随手拍分类id
-     * @return  随手拍分类
+     * 
+     * @param id
+     *            随手拍分类id
+     * @return 随手拍分类
      */
     @GetMapping("/admin/detail")
     public R detailPhotoClassify(@RequestParam("id") Long id) {
@@ -48,8 +56,10 @@
 
     /**
      * 运营后台-分页查询随手拍分类
-     * @param addPhotoClassify  请求参数
-     * @return  随手拍分类列表
+     * 
+     * @param addPhotoClassify
+     *            请求参数
+     * @return 随手拍分类列表
      */
     @PostMapping("/admin/page")
     public R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
@@ -58,7 +68,8 @@
 
     /**
      * 运营后台-查询随手拍分类列表
-     * @return  随手拍分类列表
+     * 
+     * @return 随手拍分类列表
      */
     @GetMapping("/admin/list")
     public R listPhotoClassify() {
@@ -67,8 +78,10 @@
 
     /**
      * 运营后台-随手拍分类删除
-     * @param id    随手拍分类id
-     * @return  删除结果
+     * 
+     * @param id
+     *            随手拍分类id
+     * @return 删除结果
      */
     @GetMapping("/admin/delete")
     public R deletePhotoClassify(@RequestParam("id") Long id) {

--
Gitblit v1.7.1