更新！

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

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.devices;
 
-import com.github.microservice.models.type.DeviceState;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceState;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
 import com.zhongshu.card.client.model.school.AreaModel;

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

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.client.type.PaymentModeType;

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

@@ -1,9 +1,9 @@
 package com.zhongshu.card.client.model.devices;
 
 import com.github.microservice.models.device.DeviceAboutInfo;
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceState;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceSpecType;
+import com.github.microservice.types.deviceUse.DeviceState;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;

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

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.devices;
 
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceSpecType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperParam;
 import com.zhongshu.card.client.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.devices;
 
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceSpecType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoStoreModel.java

@@ -1,9 +1,7 @@
 package com.zhongshu.card.client.model.devices;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.model.org.OrganizationMiniModel;
-import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
 import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceUseRecordModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.devices;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.github.microservice.types.deviceUse.OperateState;
 import com.github.microservice.types.deviceUse.OperateType;
 import com.zhongshu.card.client.model.base.SuperModel;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceUseRecordSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.github.microservice.types.deviceUse.OperateState;
 import com.github.microservice.types.deviceUse.OperateType;
 import com.github.microservice.types.user.DevicePermissFromType;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/deviceProduct/DeviceProductBindDeviceModel.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.devices.deviceProduct;
 
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceSpecType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.devices.DeviceInfoModel;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/deviceProduct/DeviceProductBindDeviceSearch.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.devices.deviceProduct;
 
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceSpecType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/permiss/DevicePermissModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices.permiss;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.devices.DeviceInfoModel;
 import com.zhongshu.card.client.model.org.DepartmentModel;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/permiss/DevicePermissSearch.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.model.devices.permiss;
 
 import com.github.microservice.auth.security.type.AuthType;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.client.type.UserState;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/permiss/PermissSettingConfigModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices.permiss;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.type.Sex;
 import com.zhongshu.card.client.type.device.PermissSettingDeviceType;
 import com.zhongshu.card.client.type.device.PermissSettingType;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/permiss/PermissSettingConfigParam.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices.permiss;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.type.Sex;
 import com.zhongshu.card.client.type.device.PermissSettingDeviceType;
 import com.zhongshu.card.client.type.device.PermissSettingType;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/permiss/PermissSettingListSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices.permiss;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.type.Sex;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/userCache/UserCacheModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.devices.userCache;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.type.Sex;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.operLogs;
 
-import com.github.microservice.models.type.LogServiceType;
+import com.github.microservice.types.deviceUse.LogServiceType;
 import com.zhongshu.card.client.type.LoginType;
 import com.zhongshu.card.client.type.LogsLevel;
 import com.zhongshu.card.client.type.MessageType;
@@ -8,8 +8,6 @@ import com.zhongshu.card.client.type.ResponseCode;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 操作日志
  *

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

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.payment;
 
-import com.github.microservice.models.type.OrderFromType;
+import com.github.microservice.types.deviceUse.OrderFromType;
 import com.github.microservice.types.OrderModeType;
 import com.github.microservice.types.payment.ChargeableType;
 import com.github.microservice.types.payment.PaymentDeviceType;

FullCardClient/src/main/java/com/zhongshu/card/client/model/visitor/setting/VisitorSettingDeviceModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.visitor.setting;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.devices.DeviceInfoModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

FullCardClient/src/main/java/com/zhongshu/card/client/model/visitor/setting/VisitorSettingDeviceSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.visitor.setting;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.base.SuperSearch;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/model/DeviceInfoOpenApiModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.openApi.model;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
 import com.zhongshu.card.client.model.school.AreaSimpleModel;

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/model/DeviceInfoOpenApiSimpleModel.java

@@ -1,17 +1,11 @@
 package com.zhongshu.card.client.openApi.model;
 
-import com.github.microservice.models.type.DeviceType;
-import com.zhongshu.card.client.model.org.OrganizationMiniModel;
-import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
-import com.zhongshu.card.client.model.school.AreaSimpleModel;
-import com.zhongshu.card.client.type.DataState;
-import com.zhongshu.card.client.type.OnLineState;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.opengateway.client.model.OpenApiModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.ObjectUtils;
 
 /**
  * @author TRX

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/model/DevicePermissOpenApiModel.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.openApi.model;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.openApi.base.SuperAPIModel;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.Sex;

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/params/DeviceInfoOpenApiSearch.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.openApi.params;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.openApi.base.SuperOpenAPIParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceBind.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.domain.devices;
 
-import com.github.microservice.models.type.DeviceState;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceState;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.client.type.PaymentModeType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceInfo.java

@@ -1,9 +1,9 @@
 package com.zhongshu.card.server.core.domain.devices;
 
 import com.github.microservice.models.device.DeviceAboutInfo;
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceState;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceSpecType;
+import com.github.microservice.types.deviceUse.DeviceState;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import com.zhongshu.card.server.core.domain.org.Organization;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceProductBindDevice.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.domain.devices;
 
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceSpecType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceUseRecords.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.domain.devices;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.github.microservice.types.deviceUse.DeviceUseState;
 import com.github.microservice.types.deviceUse.OperateState;
 import com.github.microservice.types.deviceUse.OperateType;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/permiss/DevicePermiss.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.domain.devices.permiss;
 
 import com.github.microservice.auth.security.type.AuthType;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.client.type.UserState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/permiss/PermissSettingList.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.domain.devices.permiss;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.client.type.Sex;
 import com.zhongshu.card.client.type.device.PermissSettingDeviceType;
 import com.zhongshu.card.client.type.device.PermissSettingType;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/operlog/OperationLogs.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.domain.operlog;
 
-import com.github.microservice.models.type.LogServiceType;
+import com.github.microservice.types.deviceUse.LogServiceType;
 import com.zhongshu.card.client.type.LoginType;
 import com.zhongshu.card.client.type.LogsLevel;
 import com.zhongshu.card.client.type.MessageType;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -1,8 +1,8 @@
 package com.zhongshu.card.server.core.domain.payment;
 
 import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.DeviceType;
-import com.github.microservice.models.type.OrderFromType;
+import com.github.microservice.types.deviceUse.DeviceType;
+import com.github.microservice.types.deviceUse.OrderFromType;
 import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
 import com.github.microservice.types.OrderModeType;
 import com.github.microservice.types.OrderState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/visitor/VisitorSettingDevice.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.domain.visitor;
 
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/ProjectSyncIotCenterService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.service.devices;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.models.project.ProjectSyncParam;
-import com.github.microservice.models.type.CommonState;
+import com.github.microservice.types.common.CommonState;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.type.OrganizationState;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/PermissSettingService.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.service.devices.permiss;
 
 import com.github.microservice.components.data.base.util.PageEntityUtil;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.zhongshu.card.client.model.devices.permiss.*;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/UserPermissDataCacheService.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.service.devices.permiss;
 
-import com.github.microservice.models.type.DeviceState;
+import com.github.microservice.types.deviceUse.DeviceState;
 import com.zhongshu.card.client.model.devices.userCache.UserCacheModel;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.UserState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/hxz/HxzService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.service.hxz;
 
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.models.hxz.*;
-import com.github.microservice.models.type.OrderFromType;
+import com.github.microservice.types.deviceUse.OrderFromType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -10,8 +10,8 @@ import com.github.microservice.models.hxz.ConsumTransactionsResult;
 import com.github.microservice.models.hxz.QRCodeTransactionModel;
 import com.github.microservice.models.hxz.WxPayResult;
 import com.github.microservice.models.hxz.base.IotBaseResult;
-import com.github.microservice.models.type.DeviceState;
-import com.github.microservice.models.type.OrderFromType;
+import com.github.microservice.types.deviceUse.DeviceState;
+import com.github.microservice.types.deviceUse.OrderFromType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.github.microservice.pay.client.model.ledger.TransactionLogModel;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/OrderService.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.service.payment;
 
-import com.github.microservice.models.type.OrderFromType;
+import com.github.microservice.types.deviceUse.OrderFromType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.types.payment.ChargeableType;
 import com.github.microservice.types.payment.PaymentType;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/permissVerify/DevicePermissVerifyService.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.service.permissVerify;
 
 import com.github.microservice.models.gateDoor.use.DeviceUseParam;
-import com.github.microservice.models.type.DeviceState;
+import com.github.microservice.types.deviceUse.DeviceState;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.devices.permiss.PermissSettingListSearch;
 import com.zhongshu.card.client.model.devices.permiss.TimeSlotModel;

FullCardServer/src/main/java/com/zhongshu/card/server/core/util/CommonUtil.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.util;
 
 import com.github.microservice.core.util.net.IPUtil;
-import com.github.microservice.models.type.LogServiceType;
+import com.github.microservice.types.deviceUse.LogServiceType;
 import com.google.common.collect.Lists;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.j2se.MatrixToImageWriter;