From 77bd80eadf1d3b973f640b8e7d9b630d14afb2d8 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 15:03:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index b46fcc5..b9bf7c6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1837,7 +1837,7 @@
      * @param id
      * @return
      */
-    @PostMapping("/shop/changeShopGoodsStatus")
+    @GetMapping("/shop/changeShopGoodsStatus")
     R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status);
     /**
      * 结果
@@ -1855,9 +1855,9 @@
     R pageShopOperLog(@RequestBody PageDTO pageDTO);
 
     /**
-     * 分页查询 商家后台操作日志
+     * 订单分页查询
      * @param pageComShopOrderSearchDTO 分页数据
-     * @return 分页日志
+     * @return 订单分页查询
      */
     @PostMapping("/shop/order/page")
     R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);

--
Gitblit v1.7.1