Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 2384c489bc788ee60d49a1a07bb8059f4a15352a

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

@@ -3,10 +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.grid.EventGridMemberEditStatusDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberPassResetDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
@@ -449,7 +446,7 @@
     * @param gridMemberDTO 请求参数
     * @return  编辑结果
     */
    R editGridUser(EventGridMemberAddDTO gridMemberDTO);
    R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO);

    /**
     * 网格员重置密码
@@ -461,4 +458,6 @@
    R deleteMembers(List<Long> Ids);

    R gridMemberEditStatus(EventGridMemberEditStatusDTO gridMemberEditDTO);

    R noTips(Long userId);
}