From 7e1573db4f262a25a9674c1ea5e1b58bfe7712f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 4 Jul 2024 22:43:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=9F=E6=88=B7=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gxwebsoft/common/system/controller/MainController.java  | 2 ++
 src/main/java/com/gxwebsoft/common/system/entity/User.java      | 1 +
 .../gxwebsoft/common/system/service/impl/TenantServiceImpl.java | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index a50320c..23cf5be 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -516,6 +516,8 @@ public class MainController extends BaseController {
     company.setEmail(email);
     company.setPassword(password);
     company.setTid(tenant.getTenantId());
+    company.setCompanyName(tenantName);
+    company.setShortName(tenantName);
     company.setTenantId(tenant.getTenantId());
     tenantService.initialization(company);
     return success("注册成功", tenant.getTenantId());
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java
index 8b011b5..a70a311 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/User.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java
@@ -77,6 +77,7 @@ public class User implements UserDetails {
     private String idCard;
 
     @ApiModelProperty("身份证号")
+    @TableField(exist = false)
     private String idCardNo;
 
     @ApiModelProperty("出生日期")
diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
index 83cf5a3..6c5de82 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
@@ -591,7 +591,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
       // 发送邮件通知
       String title = "恭喜！您的账号已注册成功";
       String content = "租户ID：".concat(company.getTid().toString()).concat("\r\n名称：" + company.getShortName()).concat("\r\n账号：" + company.getPhone()).concat("\r\n密码：" + company.getPassword());
-      String adminUrl = "\r\n后台管理：".concat("http://").concat(company.getTid().toString()).concat(".adm.wsdns.cn");
+      String adminUrl = "\r\n后台管理：".concat("http://").concat(company.getTid().toString()).concat(".admin.websoft.top");
       // 发送邮件通知
       emailRecordService.sendEmail(title, content.concat(adminUrl), company.getEmail());
       return true;