Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

CeDo

2021-05-31 db3376279794f2216be07cc2bb298c9a2faf33e6

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
@@ -270,7 +271,7 @@
    @PostMapping("listfamily")
    public R listFamily(@RequestParam("userId") Long userId,
                        @RequestParam(value = "pageNum") Long pageNum,
                        @RequestParam("pageNum") Long pageSize) {
                        @RequestParam("pageSize") Long pageSize) {
        return userService.listFamily(userId, pageNum, pageSize);
    }

@@ -567,6 +568,17 @@
    @PostMapping("updateuserispartymember")
    public R updateUserIsPartymember(@RequestParam("idCard") String idCard) {
        return userService.updateUserIsPartymember(idCard);
    }


    /**
     * 修改用户为非党员状态
     * @param idCard 身份证号
     * @return 修改结果
     */
    @PostMapping("updateusernotpartymember")
    R updateUserNotPartymember(@RequestParam("idCard")String idCard){
        return userService.updateUserNotPartymember(idCard);
    }

    /**
@@ -881,4 +893,14 @@
    public R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO) {
        return userService.updateUserArchives(userArchivesVO);
    }

    /**
     * 修改app用户密码
     * @param userInfoAppDTO    请求参数
     * @return  修改结果
     */
    @PutMapping("updateUserPassByApp")
    public R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO){
        return userService.updateUserPassByApp(userInfoAppDTO);
    }
}