Merge remote-tracking branch 'origin/master'

fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

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

fs-company-app/src/main/java/com/fs/app/param/FsUserUpdateParam.java

@@ -14,10 +14,10 @@ public class FsUserUpdateParam {
     @NotNull(message = "用户ID不能为空")
     private Long fsUserId;
     /**
-     * 用户名称
+     * 用户昵称
      */
-    @ApiModelProperty("用户名称")
-    private String userName;
+    @ApiModelProperty("用户昵称")
+    private String nickName;
     /**
      * 用户备注
      */

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyTagUserServiceImpl.java

@@ -165,6 +165,7 @@ public class CompanyTagUserServiceImpl implements ICompanyTagUserService
             companyTagUser.setCompanyId(fsUser.getCompanyId());
             companyTagUser.setCompanyUserId(fsUser.getCompanyUserId());
             companyTagUser.setTagIds(tagIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
+            companyTagUser.setCreateTime(new Date());
             companyTagUserMapper.insertCompanyTagUser(companyTagUser);
         }
     }