|  | @@ -5,14 +5,11 @@ import com.alibaba.fastjson.JSON;
 | 
											
												
													
														|  |  import com.fs.app.annotation.Login;
 |  |  import com.fs.app.annotation.Login;
 | 
											
												
													
														|  |  import com.fs.app.param.FsUserTagUpdateParam;
 |  |  import com.fs.app.param.FsUserTagUpdateParam;
 | 
											
												
													
														|  |  import com.fs.app.param.FsUserUpdateParam;
 |  |  import com.fs.app.param.FsUserUpdateParam;
 | 
											
												
													
														|  | -import com.fs.app.utils.ValidateUtil;
 |  | 
 | 
											
												
													
														|  | -import com.fs.common.core.domain.R;
 |  | 
 | 
											
												
													
														|  |  import com.fs.common.core.domain.ResponseResult;
 |  |  import com.fs.common.core.domain.ResponseResult;
 | 
											
												
													
														|  |  import com.fs.common.exception.ServiceException;
 |  |  import com.fs.common.exception.ServiceException;
 | 
											
												
													
														|  |  import com.fs.company.domain.CompanyUser;
 |  |  import com.fs.company.domain.CompanyUser;
 | 
											
												
													
														|  |  import com.fs.company.service.ICompanyTagUserService;
 |  |  import com.fs.company.service.ICompanyTagUserService;
 | 
											
												
													
														|  |  import com.fs.company.service.ICompanyUserService;
 |  |  import com.fs.company.service.ICompanyUserService;
 | 
											
												
													
														|  | -import com.fs.company.vo.CompanyQueryVo;
 |  | 
 | 
											
												
													
														|  |  import com.fs.course.vo.newfs.FsCourseAnalysisVO;
 |  |  import com.fs.course.vo.newfs.FsCourseAnalysisVO;
 | 
											
												
													
														|  |  import com.fs.store.param.h5.CourseAnalysisParam;
 |  |  import com.fs.store.param.h5.CourseAnalysisParam;
 | 
											
												
													
														|  |  import com.fs.store.domain.FsUser;
 |  |  import com.fs.store.domain.FsUser;
 | 
											
										
											
												
													
														|  | @@ -35,7 +32,6 @@ import java.text.SimpleDateFormat;
 | 
											
												
													
														|  |  import java.time.LocalDate;
 |  |  import java.time.LocalDate;
 | 
											
												
													
														|  |  import java.util.Date;
 |  |  import java.util.Date;
 | 
											
												
													
														|  |  import java.util.List;
 |  |  import java.util.List;
 | 
											
												
													
														|  | -import java.util.Map;
 |  | 
 | 
											
												
													
														|  |  import java.util.Objects;
 |  |  import java.util.Objects;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  @Slf4j
 |  |  @Slf4j
 | 
											
										
											
												
													
														|  | @@ -220,7 +216,7 @@ public class FsUserController extends AppBaseController {
 | 
											
												
													
														|  |              throw new ServiceException("用户不存在");
 |  |              throw new ServiceException("用户不存在");
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -        fsUser.setUsername(param.getUserName());
 |  | 
 | 
											
												
													
														|  | 
 |  | +        fsUser.setNickname(param.getNickName());
 | 
											
												
													
														|  |          fsUser.setRemark(param.getRemark());
 |  |          fsUser.setRemark(param.getRemark());
 | 
											
												
													
														|  |          fsUserService.updateFsUser(fsUser);
 |  |          fsUserService.updateFsUser(fsUser);
 | 
											
												
													
														|  |          return ResponseResult.ok();
 |  |          return ResponseResult.ok();
 |