# Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/resources/all-application.yml