Conflicts: src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001D.java src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD099.java
