From a1844a7fc934ca943db810b1bd2a450f948607cd Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 03 六月 2021 14:23:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htasrs0' into htasrs0

---
 src/main/java/com/zy/common/properties/SystemProperties.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index 8aaa8ef..ba6350b 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -63,7 +63,7 @@
 
     // 鐢熸垚婵�娲荤爜
     public static void main(String[] args) {
-        String timeStr = "2020-08-01 17:48:35";
+        String timeStr = "2021-08-01 17:48:35";
         Date exprTime = DateUtils.convert(timeStr);
         String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
         System.out.println("婵�娲荤爜锛�"+code);

--
Gitblit v1.9.1