From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java
index a75c51d..fe7d2df 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CodeGenerateUtils.java
@@ -66,10 +66,10 @@
         Calendar calendar = Calendar.getInstance();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
         String dateTime = dateFormat.format(calendar.getTime());
-        dateTime = dateTime.substring(2);
+        dateTime = dateTime.substring(0);
         String timestampPart = "" + (Math.random() * 10000) * (System.currentTimeMillis() / 10000);
         timestampPart = timestampPart.replace(".", "").replace("E", "");
-        timestampPart = timestampPart.substring(0, 0);
+        timestampPart = timestampPart.substring(0, 6);
         return dateTime + timestampPart;
     }
     /**
@@ -89,7 +89,10 @@
     }
 
     public static void main(String[] args) {
-        System.err.println(generateVolumeSn("2"));
+        for (int i = 0; i < 5; i++) {
+            System.err.println(generateVolumeSn());
+
+        }
     }
 
 }

--
Gitblit v1.7.1