Conflicts: src/main/java/com/baosight/hggp/hg/sc/domain/HGSC010A.java src/main/java/com/baosight/hggp/hg/sc/sql/HGSC010A.xml
