From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge
---
src/main/java/com/xcong/excoin/configurations/properties/ApplicationProperties.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/configurations/properties/ApplicationProperties.java b/src/main/java/com/xcong/excoin/configurations/properties/ApplicationProperties.java
index cdacf9b..df5dd50 100644
--- a/src/main/java/com/xcong/excoin/configurations/properties/ApplicationProperties.java
+++ b/src/main/java/com/xcong/excoin/configurations/properties/ApplicationProperties.java
@@ -15,4 +15,8 @@
@ConfigurationProperties(prefix = "app")
public class ApplicationProperties {
private boolean debug;
+
+ private Long redisExpire;
+
+ private String project;
}
--
Gitblit v1.9.1