From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-common/src/main/java/org/sxkj/common/constant/CommonConstant.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drone-common/src/main/java/org/sxkj/common/constant/CommonConstant.java b/drone-common/src/main/java/org/sxkj/common/constant/CommonConstant.java
index 1ac5d7a..9d8e681 100644
--- a/drone-common/src/main/java/org/sxkj/common/constant/CommonConstant.java
+++ b/drone-common/src/main/java/org/sxkj/common/constant/CommonConstant.java
@@ -91,6 +91,8 @@
 
 	public static final String yyyyMMdd="yyyyMMdd";
 
+	public static final String yyyyMMddHHmmss="yyyyMMddHHmmss";
+
 	/**
 	 * 个人工作台日历上回显
 	 */

--
Gitblit v1.9.3