From 5b8607464905c4a585fb8e859985730e1ee61f40 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期五, 21 二月 2025 10:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116_1' into dev-20250116_1

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/RandomUtil.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RandomUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RandomUtil.java
index 80a68c2..bff1051 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RandomUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RandomUtil.java
@@ -48,7 +48,7 @@
         String datePart = new SimpleDateFormat("yyyyMMddhhmm").format(new Date());
         int randomPart = RANDOM.nextInt(90000) + 10000; // 生成5位随机数
 
-        return ORDER_PER + datePart + String.format("%05d", randomPart) + dataId;
+        return orderType + datePart + String.format("%05d", randomPart) + dataId;
     }
 
 }

--
Gitblit v1.9.2