Conflicts: src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
