Conflicts: src/main/java/com/baosight/hpjx/hp/constant/HPConstant.java
Conflicts: src/main/resources/application.properties src/main/resources/quartz.properties