From a8ba074e4b0807cee707614a55e31e34ea0fbbde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 四月 2021 10:29:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 5bffdc5..6814eb2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -613,7 +613,7 @@
      * @return
      */
     @PostMapping("common/data/special/tags/page")
-    R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO);
+    R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO);
 
     /**
      * 新增或修改特殊群体标签
@@ -653,4 +653,20 @@
      */
     @PostMapping("addSysUser")
     R addSysUser(@RequestBody ShopStoreVO storeVO);
+
+    /**
+     * 修改SysUser信息
+     * @param storeVO   sysUser信息
+     * @return  修改结果
+     */
+    @PostMapping("editSysUser")
+    R editSysUser(@RequestBody ShopStoreVO storeVO);
+
+    /**
+     * 修改用户小程序首页活动提示
+     * @param userEditTipsDTO  请求参数
+     * @return  修改结果
+     */
+    @PostMapping("editUserTips")
+    R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO);
 }

--
Gitblit v1.7.1