From 827bbc2b17fdcf2638a9646af0e99821aa63caa1 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期日, 21 六月 2020 10:06:26 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue --- ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java b/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java index 3adf3df..38311e9 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java +++ b/ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java @@ -376,6 +376,7 @@ * * @return UUID 鐨勫搱甯岀爜鍊笺�� */ + @Override public int hashCode() { long hilo = mostSigBits ^ leastSigBits; @@ -391,6 +392,7 @@ * * @return 濡傛灉瀵硅薄鐩稿悓锛屽垯杩斿洖 {@code true}锛涘惁鍒欒繑鍥� {@code false} */ + @Override public boolean equals(Object obj) { if ((null == obj) || (obj.getClass() != UUID.class)) @@ -414,6 +416,7 @@ * @return 鍦ㄦ UUID 灏忎簬銆佺瓑浜庢垨澶т簬 val 鏃讹紝鍒嗗埆杩斿洖 -1銆�0 鎴� 1銆� * */ + @Override public int compareTo(UUID val) { // The ordering is intentionally set up so that the UUIDs -- Gitblit v1.9.3