conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

 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;
}