Merge remote-tracking branch 'origin/master'

CeDo

2021-04-25 fb4639c3239dfa483aa791a9a31bd095320e48c6

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -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);
}