From dbbd8b7066092b3ce4eab44fa0e2b746dad16a95 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 07 七月 2023 19:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java b/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
index 52ba697..9f78a1b 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
@@ -89,8 +89,8 @@
//鍔ㄤ綔缂栫爜锛�0=鍏抽棴/绾㈢伅锛�1=鎵撳紑/璺伅
private String actionCode;
- //鍔ㄤ綔缂栫爜锛岃澶囩紪鍙�
- private String deviceId;
+ //璁惧缂栧彿
+ private int deviceCode;
public ApiInoutData() {
@@ -117,5 +117,6 @@
this.snapType = conf.getSnapType();
this.mediaAddr = conf.getMediaAddr();
this.errorMsg = conf.getErrorMsg();
+ this.deviceCode = conf.getInOrder();
}
}
--
Gitblit v1.9.3