From 4c97a2ce0b749232584a50998bdd12ed9a6062d2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 21 十二月 2024 10:28:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
index a42953c..5f05861 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
@@ -703,8 +703,7 @@
// s1涓嶅彉
s0 <<= 8;
s = s0 | s1;
- return (short) s;
-
+ return (short)s ;
} else {
throw new Exception("byte2Short鏃舵暟缁勮秺鐣�");
}
--
Gitblit v1.8.0