From 8a87e4226aa802d6a0e3566c66824fedf68e77da Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/CANDIDATE_INFO_CEX.java |  134 ++++++++++++++++++++++----------------------
 1 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/CANDIDATE_INFO_CEX.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/CANDIDATE_INFO_CEX.java
index d032984..bbcb7cf 100644
--- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/CANDIDATE_INFO_CEX.java
+++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/CANDIDATE_INFO_CEX.java
@@ -1,67 +1,67 @@
-package com.netsdk.lib.structure.customize;
-
-import com.ruoyi.device.dhsdk.lib.NetSDKLib;
-import com.ruoyi.device.dhsdk.lib.Utils;
-import com.ruoyi.device.dhsdk.lib.structure.NET_TIME;
-
-import java.nio.charset.Charset;
-import java.util.Arrays;
-
-/**
- * @author 47081
- * @version 1.0
- * @description 鍊欓�変汉淇℃伅鎷撳睍缁撴瀯浣�()锛岀粨鏋勪綋, 鏃ュ父浣跨敤浠tructure鍖呭拰NetSDKLib涓嬬殑鍚屽悕缁撴瀯浣撲负涓�
- * @date 2021/3/17
- */
-public class CANDIDATE_INFO_CEX extends NetSDKLib.SdkStructure {
-  /** 濮撳悕 */
-  public byte[] szPersonName = new byte[64];
-  /** 浜哄憳鍞竴鏍囩ず(璇佷欢鍙风爜,宸ュ彿,鎴栧叾浠栫紪鍙�) */
-  public byte[] szID = new byte[32];
-  /** 鍜屾煡璇㈠浘鐗囩殑鐩镐技搴�,鐧惧垎姣旇〃绀�,1~100 */
-  public byte bySimilarity;
-  /** 浜哄憳鎵�灞炴暟鎹簱鑼冨洿,璇﹁EM_FACE_DB_TYPE */
-  public byte byRange;
-  /** 褰揵yRange涓哄巻鍙叉暟鎹簱鏃舵湁鏁�,琛ㄧず鏌ヨ浜哄憳鍑虹幇鐨勬椂闂� */
-  public NET_TIME stTime;
-  /** 褰揵yRange涓哄巻鍙叉暟鎹簱鏃舵湁鏁�,琛ㄧず鏌ヨ浜哄憳鍑虹幇鐨勫湴鐐� */
-  public byte[] szAddress = new byte[260];
-  /** 鏄惁鏈夎瘑鍒粨鏋�,鎸囪繖涓娴嬪嚭鐨勪汉鑴稿湪搴撲腑鏈夋病鏈夋瘮瀵圭粨鏋� */
-  public boolean bIsHit;
-  /** 閫氶亾鍙� */
-  public int nChannelID;
-
-  public String getPersonName() {
-    return new String(szPersonName, Charset.forName(Utils.getPlatformEncode())).trim();
-  }
-
-  public String getID() {
-    return new String(szID, Charset.forName(Utils.getPlatformEncode())).trim();
-  }
-
-  public String getAddress() {
-    return new String(szAddress, Charset.forName(Utils.getPlatformEncode())).trim();
-  }
-
-  @Override
-  public String toString() {
-    return "CANDIDATE_INFO_CEX{"
-        + "szPersonName="
-        + getPersonName()
-        + ", szID="
-        + getID()
-        + ", bySimilarity="
-        + bySimilarity
-        + ", byRange="
-        + byRange
-        + ", stTime="
-        + stTime
-        + ", szAddress="
-        + getAddress()
-        + ", bIsHit="
-        + bIsHit
-        + ", nChannelID="
-        + nChannelID
-        + '}';
-  }
-}
+package com.ruoyi.device.dhsdk.lib.structure.customize;
+
+import com.ruoyi.device.dhsdk.lib.NetSDKLib;
+import com.ruoyi.device.dhsdk.lib.Utils;
+import com.ruoyi.device.dhsdk.lib.structure.NET_TIME;
+
+import java.nio.charset.Charset;
+import java.util.Arrays;
+
+/**
+ * @author 47081
+ * @version 1.0
+ * @description 鍊欓�変汉淇℃伅鎷撳睍缁撴瀯浣�()锛岀粨鏋勪綋, 鏃ュ父浣跨敤浠tructure鍖呭拰NetSDKLib涓嬬殑鍚屽悕缁撴瀯浣撲负涓�
+ * @date 2021/3/17
+ */
+public class CANDIDATE_INFO_CEX extends NetSDKLib.SdkStructure {
+  /** 濮撳悕 */
+  public byte[] szPersonName = new byte[64];
+  /** 浜哄憳鍞竴鏍囩ず(璇佷欢鍙风爜,宸ュ彿,鎴栧叾浠栫紪鍙�) */
+  public byte[] szID = new byte[32];
+  /** 鍜屾煡璇㈠浘鐗囩殑鐩镐技搴�,鐧惧垎姣旇〃绀�,1~100 */
+  public byte bySimilarity;
+  /** 浜哄憳鎵�灞炴暟鎹簱鑼冨洿,璇﹁EM_FACE_DB_TYPE */
+  public byte byRange;
+  /** 褰揵yRange涓哄巻鍙叉暟鎹簱鏃舵湁鏁�,琛ㄧず鏌ヨ浜哄憳鍑虹幇鐨勬椂闂� */
+  public NET_TIME stTime;
+  /** 褰揵yRange涓哄巻鍙叉暟鎹簱鏃舵湁鏁�,琛ㄧず鏌ヨ浜哄憳鍑虹幇鐨勫湴鐐� */
+  public byte[] szAddress = new byte[260];
+  /** 鏄惁鏈夎瘑鍒粨鏋�,鎸囪繖涓娴嬪嚭鐨勪汉鑴稿湪搴撲腑鏈夋病鏈夋瘮瀵圭粨鏋� */
+  public boolean bIsHit;
+  /** 閫氶亾鍙� */
+  public int nChannelID;
+
+  public String getPersonName() {
+    return new String(szPersonName, Charset.forName(Utils.getPlatformEncode())).trim();
+  }
+
+  public String getID() {
+    return new String(szID, Charset.forName(Utils.getPlatformEncode())).trim();
+  }
+
+  public String getAddress() {
+    return new String(szAddress, Charset.forName(Utils.getPlatformEncode())).trim();
+  }
+
+  @Override
+  public String toString() {
+    return "CANDIDATE_INFO_CEX{"
+        + "szPersonName="
+        + getPersonName()
+        + ", szID="
+        + getID()
+        + ", bySimilarity="
+        + bySimilarity
+        + ", byRange="
+        + byRange
+        + ", stTime="
+        + stTime
+        + ", szAddress="
+        + getAddress()
+        + ", bIsHit="
+        + bIsHit
+        + ", nChannelID="
+        + nChannelID
+        + '}';
+  }
+}

--
Gitblit v1.9.3