From 9c8ab5d5d8670e524c02b8dcbb9f6876cbe6bc3c Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期一, 23 十二月 2024 11:11:04 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- 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