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