Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/user/UserServiceImpl.java

@@ -90,7 +90,7 @@ public class UserServiceImpl implements IUserService {
      * @return
      */
     @Override
-    public JsonResult add(@RequestBody User user) {
+    public JsonResult add(User user) {
         return addUserService.add(user);
     }
 

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/user/add/AddUserService.java

@@ -56,6 +56,7 @@ public class AddUserService {
             log.info("添加用户业务接口：校验失败：{}", result.getMsg());
             return result;
         }
+        user.setTenantId(tenantId);
         // 添加oidc
         result = oidcService.addUser(user, SystemConstant.INIT_PASSWORD, null);
         if (0 != result.getCode()) {