Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -137,6 +137,7 @@ public class UserController {
             user.setCreateBy(currentUser.getUsername());
             user.setDateCreate(new Date());
             user.setDateUpdate(new Date());
+            user.setTenantId(currentUser.getTenantId());
         }
         user.setStatus(1);
         int result = userService.addUser(user) ? 1 : 0;
@@ -160,6 +161,7 @@ public class UserController {
         if(currentUser!=null) {
             user.setUpdateBy(currentUser.getUsername());
             user.setDateUpdate(new Date());
+            user.setTenantId(currentUser.getTenantId());
         }
         int result = userService.updateUserById(user) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);