机构类型

FullCardClient/pom.xml

@@ -62,6 +62,12 @@
 			<version>4.1.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.zswl</groupId>
+			<artifactId>ConfigModel</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
+
 	</dependencies>
 
 </project>

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

@@ -1,7 +1,7 @@
 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.utils.type.DeviceType;
 import com.zhongshu.card.client.utils.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,9 +1,5 @@
 package com.zhongshu.card.client.model.school;
 
-import com.zhongshu.card.client.model.base.SuperModel;
-import com.zhongshu.card.client.utils.type.DeviceType;
-import com.zhongshu.card.client.utils.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

@@ -1,7 +1,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.DeviceType;
 import com.zhongshu.card.client.utils.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

@@ -1,7 +1,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.DeviceType;
 import com.zhongshu.card.client.utils.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,20 +0,0 @@
-package com.zhongshu.card.client.utils.type;
-
-import lombok.Getter;
-
-/**
- *
- */
-public enum DeviceType {
-    Consumer("消费机"),
-    Door("门禁机"),
-    Elevator("电梯"),
-    ;
-
-    @Getter
-    private String remark;
-
-    DeviceType(String remark) {
-        this.remark = remark;
-    }
-}

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

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.domain.school;
 
-import com.zhongshu.card.client.utils.type.DeviceType;
+import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.utils.type.OnLineState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
 import io.swagger.v3.oas.annotations.media.Schema;