feat: 添加租户时增加租户配置，查询时返回租户配置

@@ -37,4 +37,6 @@ public class TenantDTO extends BaseDTO {
   @JsonSerialize(using = LocalDateTimeSerializer.class)
   @JsonSerialize(using = LocalDateTimeSerializer.class)
   @ApiModelProperty("租户到期时间")
   @ApiModelProperty("租户到期时间")
   private LocalDateTime tenantExpireTime;
   private LocalDateTime tenantExpireTime;
+  @ApiModelProperty(value = "租户配置",required = true)
+  private String tenantProfileId;
 }
 }

@@ -14,7 +14,6 @@ public class Tenant extends AuditRelatedEntity {
 
 
   private static final long serialVersionUID = 4848421848961008112L;
   private static final long serialVersionUID = 4848421848961008112L;
   private String name;
   private String name;
-  
 
 
   private String icon;
   private String icon;
 
 
@@ -28,4 +27,7 @@ public class Tenant extends AuditRelatedEntity {
 
 
   /** TB的租户ID */
   /** TB的租户ID */
   private String tenantId;
   private String tenantId;
+
+  /** 租户配置ID */
+  private String tenantProfileId;
 }
 }

@@ -47,6 +47,7 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan
     TenantDTO tenantDTO = new TenantDTO();
     TenantDTO tenantDTO = new TenantDTO();
     BeanUtils.copyProperties(tenantReqDTO, tenantDTO);
     BeanUtils.copyProperties(tenantReqDTO, tenantDTO);
     Tenant tenant = tenantDTO.getEntity(Tenant.class);
     Tenant tenant = tenantDTO.getEntity(Tenant.class);
+    tenant.setTenantProfileId(tenantReqDTO.getTenantProfileId().getId().toString());
     baseMapper.insert(tenant);
     baseMapper.insert(tenant);
     tenant.copyToDTO(tenantDTO);
     tenant.copyToDTO(tenantDTO);
     saveTenantMapping(tenantDTO.getTenantId(), tenantReqDTO.getRoleIds());
     saveTenantMapping(tenantDTO.getTenantId(), tenantReqDTO.getRoleIds());

@@ -12,11 +12,12 @@
         <result property="tenantExpireTime" column="tenant_expire_time"/>
         <result property="tenantExpireTime" column="tenant_expire_time"/>
         <result property="createTime" column="create_time"/>
         <result property="createTime" column="create_time"/>
         <result property="icon" column="icon"/>
         <result property="icon" column="icon"/>
+        <result property="tenantProfileId" column="tenant_profile_id"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="column">
     <sql id="column">
         id
         id
-                , tenant_id,name, enabled, description, default_config, tenant_expire_time, create_time,icon
+                , tenant_id,name, enabled, description, default_config, tenant_expire_time, create_time,icon,tenant_profile_id
     </sql>
     </sql>
     <select id="getTenantIdsByTenantIds" resultType="java.lang.String">
     <select id="getTenantIdsByTenantIds" resultType="java.lang.String">
         SELECT tenant_id FROM sys_tenant WHERE id IN
         SELECT tenant_id FROM sys_tenant WHERE id IN