Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-20 4e8be752d24ae22362455c16f75d3bcbccb23359

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

@@ -3,7 +3,6 @@
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.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
@@ -11,8 +10,6 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.user.*;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -361,8 +358,9 @@
    /**
     * 通过账号查询用户信息
     * @param account
     * @param type
     * @return
     */

    R getSysUserVOByAccount(String account);
    R getSysUserVOByAccount(String account, Integer type);
}