From b15e559eae82db811b31f1e3c47e3be027f20e27 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 一月 2024 16:18:28 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java
old mode 100644
new mode 100755
index ed0e0fd..ca637dd
--- a/src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java
@@ -13,7 +13,7 @@
 
     @Value("${git.branch:}")
     private String branch;
-    @Value("${git.commit.id.abbrev:}")
+    @Value("${git.commit.id:}")
     private String gitCommitId;
     @Value("${git.remote.origin.url:}")
     private String gitUrl;

--
Gitblit v1.8.0