Conflicts: src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD002A.java src/main/webapp/HG/WD/HGWD001.js
