Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-08-12 a673b25a0bc23b3b8b914088bdb7dca3d2e89d45

 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();
    }
}