Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-06-03 0a35a244f60da0d01a3a9142ed154fa9a83c4ad4

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -3,6 +3,7 @@
import com.panzhihua.common.model.dtos.PageDTO;
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.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
@@ -422,4 +423,11 @@
     * @return  修改结果
     */
    R updateUserPassByApp(EditUserInfoPassAppDTO userInfoAppDTO);

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