Conflicts: src/main/java/com/baosight/hggp/hg/cw/sql/HGCW001.xml src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java
