Conflicts: src/main/java/com/baosight/hggp/hg/wd/domain/HGWD001.java src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml src/main/webapp/HG/SC/HGSC101.jsp
