fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

 src/main/java/com/xcong/excoin/configurations/properties/ApplicationProperties.java

@@ -15,4 +15,6 @@
@ConfigurationProperties(prefix = "app")
public class ApplicationProperties {
    private boolean debug;

    private Long redisExpire;
}