From 6105a2d7b44ad0bf0d73d19df34158e9acff75af Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 06 七月 2023 09:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 91abd12..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
@@ -90,7 +90,7 @@
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