Merge branch 'test_future_wangge' into test

CeDo

2021-06-03 165f5d0ce0ee16bdce2b8af55ce4aa6383af6382

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

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -708,4 +709,12 @@
     */
    @PutMapping("updateUserPassByApp")
    R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO);

    /**
     * 添加网格员
     * @param eventGridMemberAddDTO    请求参数
     * @return  结果
     */
    @PostMapping("addGridUser")
    R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
}