031026
/
server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: 031026:9948445d7cf25fcb70aa2b10ef626705089940f5
Branches Tags
031026:master
031026:main
..
compare: 031026:0b095805a99b3d73f192b85fe1f48bab6e92fb39
Branches Tags
031026:master
031026:main

No commits in common. "9948445d7cf25fcb70aa2b10ef626705089940f5" and "0b095805a99b3d73f192b85fe1f48bab6e92fb39" have entirely different histories.
9948445d7c ... 0b095805a9

3 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

1
muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java
View File

@ -20,7 +20,6 @@ import com.muyu.system.domain.resp.UserInfoResp;
import com.muyu.system.service.*; import com.muyu.system.service.*;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java
View File

@ -182,11 +182,11 @@ public interface SysUserService extends IService<SysUser> {
* 重置用户密码 * 重置用户密码
* *
* @param user 用户信息 * @param user 用户信息
*
* @return 结果 * @return 结果
*/ */
public int resetPwd (SysUser user); public int resetPwd (SysUser user);
/** /**
* 重置用户密码 * 重置用户密码
* *

2
muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
View File

@ -50,6 +50,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
private SysUserPostMapper userPostMapper; private SysUserPostMapper userPostMapper;
@Autowired @Autowired
private SysConfigService configService; private SysConfigService configService;
/** /**
* 根据条件分页查询用户列表 * 根据条件分页查询用户列表
* *
@ -332,6 +333,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 重置用户密码 * 重置用户密码
* *
* @param user 用户信息 * @param user 用户信息
*
* @return 结果 * @return 结果
*/ */
@Override @Override