fix conflect

Helius

2022-07-05 b95699652357c6218b45eceb81170ddfebb30e1d

 src/main/java/com/xcong/farmer/cms/configurations/properties/ApplicationProperties.java

@@ -17,4 +17,8 @@

    private boolean debug;

    private String fileStoragePath;

    private String staticResourceUrl;

}