Conflicts: src/main/java/com/baosight/hggp/hg/cw/sql/HGCW009.xml src/main/webapp/HG/CW/HGCW008A.js src/main/webapp/HG/CW/HGCW008A.jsp src/main/webapp/HG/CW/HGCW008B.js src/main/webapp/HG/CW/HGCW008B.jsp src/main/webapp/HG/CW/HGCW008C.jsp src/main/webapp/HG/CW/HGCW008D.jsp
