更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/operLogs/OperationLogsModel.java

@@ -1,10 +1,10 @@
 package com.zhongshu.card.client.model.operLogs;
 
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.LoginType;
-import com.zhongshu.card.client.utils.type.LogsLevel;
-import com.zhongshu.card.client.utils.type.MessageType;
-import com.zhongshu.card.client.utils.type.ResponseCode;
+import com.zhongshu.card.client.type.LoginType;
+import com.zhongshu.card.client.type.LogsLevel;
+import com.zhongshu.card.client.type.MessageType;
+import com.zhongshu.card.client.type.ResponseCode;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/operLogs/OperationLogsSearchParam.java

@@ -1,8 +1,8 @@
 package com.zhongshu.card.client.model.operLogs;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.LoginType;
-import com.zhongshu.card.client.utils.type.LogsLevel;
+import com.zhongshu.card.client.type.LoginType;
+import com.zhongshu.card.client.type.LogsLevel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/AuthModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.utils.type.PermissionPointType;
+import com.zhongshu.card.client.type.PermissionPointType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/DepartmentModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.org;
 
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.DataState;
+import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.utils.ITree;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/DepartmentParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.org;
 
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.DataState;
+import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.utils.ITree;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/DepartmentSearchParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.org;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.DataState;
+import com.zhongshu.card.client.type.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/EditAuthParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.utils.type.EditType;
+import com.zhongshu.card.client.type.EditType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/GetPhoneModel.java

@@ -1,11 +1,10 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.utils.type.LoginFromType;
+import com.zhongshu.card.client.type.LoginFromType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author TRX

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/LoginParam.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.org;
 
 import com.github.microservice.auth.client.type.DeviceType;
 import com.github.microservice.auth.client.type.LoginType;
-import com.zhongshu.card.client.utils.type.LoginFromType;
+import com.zhongshu.card.client.type.LoginFromType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrgUserDetailParam.java

@@ -1,6 +1,5 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.utils.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationAddParam.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.org;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.OrganizationState;
+import com.zhongshu.card.client.type.OrganizationState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationModel.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.org;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.OrganizationState;
+import com.zhongshu.card.client.type.OrganizationState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationRelationSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.utils.type.OrganizationRelationType;
+import com.zhongshu.card.client.type.OrganizationRelationType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationSearchParam.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.org;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.OrganizationState;
+import com.zhongshu.card.client.type.OrganizationState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationSimpleModel.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.org;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.OrganizationState;
+import com.zhongshu.card.client.type.OrganizationState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationUpdateParam.java

@@ -1,8 +1,6 @@
 package com.zhongshu.card.client.model.org;
 
-import com.github.microservice.auth.security.type.AuthType;
-import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.OrganizationState;
+import com.zhongshu.card.client.type.OrganizationState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationUserModel.java

@@ -2,12 +2,11 @@ package com.zhongshu.card.client.model.org;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.model.school.DictInfoParam;
 import com.zhongshu.card.client.model.school.DictInfoSimpleModel;
-import com.zhongshu.card.client.utils.type.CertificateType;
-import com.zhongshu.card.client.utils.type.OrganizationUserType;
-import com.zhongshu.card.client.utils.type.Sex;
-import com.zhongshu.card.client.utils.type.UserState;
+import com.zhongshu.card.client.type.CertificateType;
+import com.zhongshu.card.client.type.OrganizationUserType;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationUserSearch.java

@@ -2,8 +2,8 @@ package com.zhongshu.card.client.model.org;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.OrganizationUserType;
-import com.zhongshu.card.client.utils.type.UserState;
+import com.zhongshu.card.client.type.OrganizationUserType;
+import com.zhongshu.card.client.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/ProjectOrgModel.java

@@ -1,8 +1,5 @@
 package com.zhongshu.card.client.model.org;
 
-import com.github.microservice.auth.security.type.AuthType;
-import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.OrganizationState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RegisterUserAccountParam.java

@@ -1,15 +1,12 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.model.school.CardInfoParam;
-import com.zhongshu.card.client.utils.type.Sex;
-import com.zhongshu.card.client.utils.type.UserType;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.UserType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.internal.build.AllowPrintStacktrace;
 
-import java.util.List;
-
 /**
  * 注册用户
  *

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RoleAddParam.java

@@ -1,9 +1,9 @@
 package com.zhongshu.card.client.model.org;
 
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.DataState;
-import com.zhongshu.card.client.utils.type.RoleType;
-import com.zhongshu.card.client.utils.type.school.RoleDefaultType;
+import com.zhongshu.card.client.type.DataState;
+import com.zhongshu.card.client.type.RoleType;
+import com.zhongshu.card.client.type.school.RoleDefaultType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/RoleModel.java

@@ -1,8 +1,8 @@
 package com.zhongshu.card.client.model.org;
 
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.DataState;
-import com.zhongshu.card.client.utils.type.RoleType;
+import com.zhongshu.card.client.type.DataState;
+import com.zhongshu.card.client.type.RoleType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/SchoolUserCountParam.java

@@ -1,11 +1,6 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.model.base.SuperParam;
 import com.zhongshu.card.client.model.school.CardInfoParam;
-import com.zhongshu.card.client.utils.type.OrganizationUserType;
-import com.zhongshu.card.client.utils.type.Sex;
-import com.zhongshu.card.client.utils.type.UserState;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UpdateUserStateParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.utils.type.UserState;
+import com.zhongshu.card.client.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountAddParam.java

@@ -1,10 +1,10 @@
 package com.zhongshu.card.client.model.org;
 
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.CertificateType;
-import com.zhongshu.card.client.utils.type.OrganizationUserType;
-import com.zhongshu.card.client.utils.type.Sex;
-import com.zhongshu.card.client.utils.type.UserState;
+import com.zhongshu.card.client.type.CertificateType;
+import com.zhongshu.card.client.type.OrganizationUserType;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountDetailsModel.java

@@ -1,9 +1,5 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.Sex;
-import com.zhongshu.card.client.utils.type.UserLoginType;
-import com.zhongshu.card.client.utils.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountModel.java

@@ -1,10 +1,10 @@
 package com.zhongshu.card.client.model.org;
 
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.CertificateType;
-import com.zhongshu.card.client.utils.type.Sex;
-import com.zhongshu.card.client.utils.type.UserLoginType;
-import com.zhongshu.card.client.utils.type.UserState;
+import com.zhongshu.card.client.type.CertificateType;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.UserLoginType;
+import com.zhongshu.card.client.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountSearchParam.java

@@ -1,10 +1,10 @@
 package com.zhongshu.card.client.model.org;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.Sex;
-import com.zhongshu.card.client.utils.type.UserLoginType;
-import com.zhongshu.card.client.utils.type.UserState;
-import com.zhongshu.card.client.utils.type.UserType;
+import com.zhongshu.card.client.type.Sex;
+import com.zhongshu.card.client.type.UserLoginType;
+import com.zhongshu.card.client.type.UserState;
+import com.zhongshu.card.client.type.UserType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountUpdateBaseParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.utils.type.Sex;
+import com.zhongshu.card.client.type.Sex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountUpdateParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.org;
 
-import com.zhongshu.card.client.utils.type.Sex;
+import com.zhongshu.card.client.type.Sex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowModel.java

@@ -1,11 +1,10 @@
 package com.zhongshu.card.client.model.payment;
 
-import cn.hutool.json.JSONObject;
 import com.github.microservice.models.type.PaymentDeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.school.CardInfoModel;
-import com.zhongshu.card.client.utils.type.OrderType;
-import com.zhongshu.card.client.utils.type.RefundState;
+import com.zhongshu.card.client.type.OrderType;
+import com.zhongshu.card.client.type.RefundState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/ExpenseFlowSearch.java

@@ -1,15 +1,13 @@
 package com.zhongshu.card.client.model.payment;
 
-import cn.hutool.json.JSONObject;
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.OrderType;
-import com.zhongshu.card.client.utils.type.RefundState;
-import com.zhongshu.card.client.utils.type.StatisticType;
+import com.zhongshu.card.client.type.OrderType;
+import com.zhongshu.card.client.type.RefundState;
+import com.zhongshu.card.client.type.StatisticType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.List;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/PicUpModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.payment;
 
-import com.zhongshu.card.client.utils.type.payment.PicType;
+import com.zhongshu.card.client.type.payment.PicType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/RequestInfoSaveParam.java

@@ -1,13 +1,11 @@
 package com.zhongshu.card.client.model.payment;
 
-import com.zhongshu.card.client.utils.type.payment.RequestType;
+import com.zhongshu.card.client.type.payment.RequestType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
-
 /**
  * @author TRX
  * @date 2024/8/22

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletModel.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.payment;
 
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.UserCountModel;
-import com.zhongshu.card.client.utils.type.DataState;
+import com.zhongshu.card.client.type.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletParam.java

@@ -1,14 +1,11 @@
 package com.zhongshu.card.client.model.payment;
 
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
-
 /**
  * @author TRX
  * @date 2024/6/28

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletRechargeModel.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.payment;
 
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.UserCountModel;
-import com.zhongshu.card.client.utils.type.RechargeType;
+import com.zhongshu.card.client.type.RechargeType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletRechargeSearch.java

@@ -1,14 +1,12 @@
 package com.zhongshu.card.client.model.payment;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.RechargeType;
+import com.zhongshu.card.client.type.RechargeType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
-
 /**
  * @author TRX
  * @date 2024/6/28

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletSearch.java

@@ -1,14 +1,11 @@
 package com.zhongshu.card.client.model.payment;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
-
 /**
  * @author TRX
  * @date 2024/6/28

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/paySetting/ProjectPaySettingConfig.java

@@ -1,11 +1,10 @@
 package com.zhongshu.card.client.model.payment.paySetting;
 
-import com.zhongshu.card.client.utils.type.payment.ProjectPayChannelType;
+import com.zhongshu.card.client.type.payment.ProjectPayChannelType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author TRX

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/paySetting/ProjectPaySettingModel.java

@@ -1,7 +1,6 @@
 package com.zhongshu.card.client.model.payment.paySetting;
 
-import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.payment.ProjectPayChannelType;
+import com.zhongshu.card.client.type.payment.ProjectPayChannelType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/paySetting/ProjectPaySettingParam.java

@@ -1,7 +1,6 @@
 package com.zhongshu.card.client.model.payment.paySetting;
 
-import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.payment.ProjectPayChannelType;
+import com.zhongshu.card.client.type.payment.ProjectPayChannelType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/paySetting/ProjectPaySettingSearch.java

@@ -1,6 +1,5 @@
 package com.zhongshu.card.client.model.payment.paySetting;
 
-import com.zhongshu.card.client.utils.type.payment.ProjectPayChannelType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/statistic/StatisticSearch.java

@@ -1,13 +1,11 @@
 package com.zhongshu.card.client.model.payment.statistic;
 
-import com.zhongshu.card.client.utils.type.StatisticType;
+import com.zhongshu.card.client.type.StatisticType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 /**
  * 商户首页统计
  *

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/AreaModel.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.utils.ITree;
-import com.zhongshu.card.client.utils.type.DataState;
+import com.zhongshu.card.client.type.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/AreaParam.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperParam;
 import com.zhongshu.card.client.utils.ITree;
-import com.zhongshu.card.client.utils.type.DataState;
+import com.zhongshu.card.client.type.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/BookInfoAddParam.java

@@ -1,9 +1,9 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.BookState;
-import com.zhongshu.card.client.utils.type.OrganizationUserType;
-import com.zhongshu.card.client.utils.type.Sex;
+import com.zhongshu.card.client.type.BookState;
+import com.zhongshu.card.client.type.OrganizationUserType;
+import com.zhongshu.card.client.type.Sex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/BookInfoModel.java

@@ -5,9 +5,9 @@ import com.zhongshu.card.client.model.org.DepartmentModel;
 import com.zhongshu.card.client.model.org.OrganizationModel;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.UserCountModel;
-import com.zhongshu.card.client.utils.type.BookState;
-import com.zhongshu.card.client.utils.type.OrganizationUserType;
-import com.zhongshu.card.client.utils.type.Sex;
+import com.zhongshu.card.client.type.BookState;
+import com.zhongshu.card.client.type.OrganizationUserType;
+import com.zhongshu.card.client.type.Sex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/BookInfoSearch.java

@@ -1,9 +1,9 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.BookState;
-import com.zhongshu.card.client.utils.type.OrganizationUserType;
-import com.zhongshu.card.client.utils.type.Sex;
+import com.zhongshu.card.client.type.BookState;
+import com.zhongshu.card.client.type.OrganizationUserType;
+import com.zhongshu.card.client.type.Sex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoModel.java

@@ -1,11 +1,10 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.model.org.OrganizationModel;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.UserCountModel;
-import com.zhongshu.card.client.utils.type.school.CardState;
-import com.zhongshu.card.client.utils.type.school.CardType;
+import com.zhongshu.card.client.type.school.CardState;
+import com.zhongshu.card.client.type.school.CardType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoParam.java

@@ -1,8 +1,8 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.school.CardState;
-import com.zhongshu.card.client.utils.type.school.CardType;
+import com.zhongshu.card.client.type.school.CardState;
+import com.zhongshu.card.client.type.school.CardType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoPoolImportParam.java

@@ -1,7 +1,6 @@
 package com.zhongshu.card.client.model.school;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.zhongshu.card.client.utils.type.school.CardType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoPoolModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.school.CardType;
+import com.zhongshu.card.client.type.school.CardType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoPoolParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.school.CardType;
+import com.zhongshu.card.client.type.school.CardType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoPoolRestoreParam.java

@@ -1,8 +1,5 @@
 package com.zhongshu.card.client.model.school;
 
-import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.school.CardType;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoPoolSearch.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.school.CardType;
+import com.zhongshu.card.client.type.school.CardType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoSearch.java

@@ -1,8 +1,8 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.school.CardState;
-import com.zhongshu.card.client.utils.type.school.CardType;
+import com.zhongshu.card.client.type.school.CardState;
+import com.zhongshu.card.client.type.school.CardType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardInfoSimpleModel.java

@@ -1,9 +1,6 @@
 package com.zhongshu.card.client.model.school;
 
-import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.model.org.UserCountModel;
-import com.zhongshu.card.client.utils.type.school.CardState;
-import com.zhongshu.card.client.utils.type.school.CardType;
+import com.zhongshu.card.client.type.school.CardState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CardLossParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.school;
 
-import com.zhongshu.card.client.utils.type.school.CardType;
+import com.zhongshu.card.client.type.school.CardType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CollegeModel.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.utils.ITree;
-import com.zhongshu.card.client.utils.type.DataState;
+import com.zhongshu.card.client.type.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/CollegeParam.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperParam;
 import com.zhongshu.card.client.utils.ITree;
-import com.zhongshu.card.client.utils.type.DataState;
+import com.zhongshu.card.client.type.DataState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DeviceBindModel.java

@@ -3,9 +3,9 @@ package com.zhongshu.card.client.model.school;
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
-import com.zhongshu.card.client.utils.type.DataState;
-import com.zhongshu.card.client.utils.type.OnLineState;
-import com.zhongshu.card.client.utils.type.PaymentModeType;
+import com.zhongshu.card.client.type.DataState;
+import com.zhongshu.card.client.type.OnLineState;
+import com.zhongshu.card.client.type.PaymentModeType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DeviceBindParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.PaymentModeType;
+import com.zhongshu.card.client.type.PaymentModeType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DeviceBindSearch.java

@@ -2,8 +2,8 @@ package com.zhongshu.card.client.model.school;
 
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.OnLineState;
-import com.zhongshu.card.client.utils.type.PaymentModeType;
+import com.zhongshu.card.client.type.OnLineState;
+import com.zhongshu.card.client.type.PaymentModeType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DeviceInfoModel.java

@@ -2,10 +2,9 @@ package com.zhongshu.card.client.model.school;
 
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.model.org.OrganizationModel;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
-import com.zhongshu.card.client.utils.type.DataState;
-import com.zhongshu.card.client.utils.type.OnLineState;
+import com.zhongshu.card.client.type.DataState;
+import com.zhongshu.card.client.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DeviceInfoParam.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.school;
 
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.OnLineState;
+import com.zhongshu.card.client.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DeviceInfoSearch.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.model.school;
 
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.OnLineState;
+import com.zhongshu.card.client.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DictInfoParam.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.DictInfoType;
+import com.zhongshu.card.client.type.DictInfoType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DictInfoSearch.java

@@ -1,8 +1,7 @@
 package com.zhongshu.card.client.model.school;
 
-import com.zhongshu.card.client.model.base.SuperParam;
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.DictInfoType;
+import com.zhongshu.card.client.type.DictInfoType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DictInfoSimpleModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.school;
 
-import com.zhongshu.card.client.utils.type.DictInfoType;
+import com.zhongshu.card.client.type.DictInfoType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/GateWayInfoModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.OnLineState;
+import com.zhongshu.card.client.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/GateWayInfoParam.java

@@ -1,7 +1,5 @@
 package com.zhongshu.card.client.model.school;
 
-import com.zhongshu.card.client.model.base.SuperParam;
-import com.zhongshu.card.client.utils.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/GateWayInfoSearch.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.utils.type.OnLineState;
+import com.zhongshu.card.client.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/RegisterUserParam.java

@@ -1,8 +1,6 @@
 package com.zhongshu.card.client.model.school;
 
 import com.zhongshu.card.client.model.org.RegisterUserAccountParam;
-import com.zhongshu.card.client.utils.type.Sex;
-import com.zhongshu.card.client.utils.type.UserType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/ArtemisType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/ArtemisType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/BookState.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/BookState.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/CardOperationType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/CardOperationType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/CertificateType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/CertificateType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/Channel.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/Channel.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 public enum Channel {
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/CommonEnum.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/CommonEnum.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 public interface CommonEnum {
     public String getRemark();

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/DataState.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/DataState.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/DictInfoType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/DictInfoType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/EditType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/EditType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 public enum EditType {
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/ErrorCode.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/ErrorCode.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/JobFlowMap.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/JobFlowMap.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import java.util.Map;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/JobFlowType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/JobFlowType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 public enum JobFlowType {
     //创建商品订单

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/LoginFromType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/LoginFromType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/LoginType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/LoginType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/LogsLevel.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/LogsLevel.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/MessageType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/MessageType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/OnLineState.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/OnLineState.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/OrderStreamType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/OrderStreamType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 public enum OrderStreamType {
     OrderStream;

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/OrderType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/OrderType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/OrganizationRelationType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/OrganizationRelationType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/OrganizationState.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/OrganizationState.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/OrganizationUserType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/OrganizationUserType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/PaymentModeType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/PaymentModeType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/PermissionPointType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/PermissionPointType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/RechargeType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/RechargeType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 import lombok.Getter;
 

FullCardClient/src/main/java/com/zhongshu/card/client/utils/type/RedisEventType.java → FullCardClient/src/main/java/com/zhongshu/card/client/type/RedisEventType.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.utils.type;
+package com.zhongshu.card.client.type;
 
 public enum RedisEventType {