Conflicts: src/main/java/com/baosight/hggp/hg/kc/domain/HGKC014A.java src/main/java/com/baosight/hggp/hg/kc/sql/HGKC014A.xml
