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

@@ -1,6 +1,6 @@
 package com.zhongshu.card.client.model.payment;
 
-import com.github.microservice.models.type.DeviceType;
+
 import com.github.microservice.types.OrderState;
 import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.client.model.org.UserCountModel;
@@ -44,8 +44,8 @@ public class OrderUnionWithModel {
     @Schema(description = "消费机设备ID")
     private String deviceId;
 
-    @Schema(description = "设备类型")
-    private DeviceType deviceType;
+//    @Schema(description = "设备类型")
+//    private DeviceType deviceType;
 
     @Schema(description = "设备所属区域信息")
     private AreaSimpleModel area;

FullCardServer/src/main/java/com/zhongshu/card/server/core/model/payment/ExpenseFlowUnionWithModel.java

@@ -2,8 +2,6 @@ package com.zhongshu.card.server.core.model.payment;
 
 import cn.hutool.json.JSONObject;
 import com.github.microservice.auth.security.type.AuthType;
-import com.github.microservice.models.type.DeviceType;
-import com.github.microservice.models.type.OrderFromType;
 import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
 import com.github.microservice.types.OrderModeType;
 import com.github.microservice.types.OrderState;
@@ -107,7 +105,7 @@ public class ExpenseFlowUnionWithModel {
     private PaymentType paymentType;
 
     @Schema(description = "支付来源：刷卡 二维码 刷脸")
-    private OrderFromType orderFromType;
+    private String orderFromType;
 
     @Schema(description = "订单生效时间")
     private Long startTime;
@@ -143,7 +141,7 @@ public class ExpenseFlowUnionWithModel {
     private String deviceId;
 
     @Schema(description = "设备类型")
-    private DeviceType deviceType;
+    private String deviceType;
 
     @Schema(description = "设备所属区域信息")
     private AreaSimpleModel area;