From 08cad817f057c4a10e1ea59e362fbb492f3381df Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
index bf88a10..4f60117 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -1,7 +1,6 @@
package com.yuanchu.mom.utils;
import com.yuanchu.mom.mapper.SystemLogMapper;
-import lombok.Builder;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -21,7 +20,7 @@
String nums = num + "";
if(nums.length() == 1) nums = "00" + num;
else if(nums.length() == 2) nums = "0" + num;
- return code + date2 + symbol + nums;
+ return code + (date2==null?date:date2) + symbol + nums;
}
}
--
Gitblit v1.9.3