Conflicts: src/main/java/com/baosight/hpjx/hp/constant/HPConstant.java src/main/resources/resources/ibatis/sqlmap-config.xml
