From 4958451d972b1872d8e852b6c3c3446e700bd806 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 01 七月 2025 10:03:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/czscwcs-version' into czscwcs-version

---
 src/main/java/com/zy/asrs/utils/Utils.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index eda8910..91ae550 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -426,4 +426,20 @@
         }
     }
 
+    public static String Fusion(int x, int y, int z){
+        String locNo="0"+x;
+        if(z>=10){
+            locNo=locNo+"0"+z;
+        }else{
+            locNo=locNo+"00"+z;
+        }
+        if(y>=10){
+            locNo=locNo+y;
+        }else {
+            locNo=locNo+"0"+y;
+        }
+
+        return locNo;
+    }
+
 }

--
Gitblit v1.9.1