Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/domain/Tenant.java

@@ -30,15 +30,15 @@ public class Tenant extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public Tenant(int type){
-        if(type== UpdateOrCreateEnum.CREATE.getCode()){
-            setCreateUser(ShiroUtils.getUserId());
-            setCreateTime(new Date());
-            setMark(MarkTypeEnum.VALID.getCode());
-        }
-        setUpdateUser(ShiroUtils.getUserId());
-        setUpdateTime(new Date());
-    }
+//    public Tenant(int type){
+//        if(type== UpdateOrCreateEnum.CREATE.getCode()){
+//            setCreateUser(ShiroUtils.getUserId());
+//            setCreateTime(new Date());
+//            setMark(MarkTypeEnum.VALID.getCode());
+//        }
+//        setUpdateUser(ShiroUtils.getUserId());
+//        setUpdateTime(new Date());
+//    }
 
     /**
      * 租户名称

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/TenantServiceImpl.java

@@ -87,7 +87,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
             throw new ServiceException(0, "系统中已经存在相同的账号信息");
         }
         // 参数转换
-        Tenant tenant = new Tenant(UpdateOrCreateEnum.CREATE.getCode());
+        Tenant tenant = new Tenant();
         BeanUtils.copyProperties(tenantDto, tenant);
         // 租户头像
         if (StringUtils.isNotNull(tenantDto.getLogo()) && tenantDto.getLogo().contains(CommonConfig.imageURL)) {