fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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