Conflicts: src/main/java/com/baosight/hggp/common/DdynamicEnum.java src/main/java/com/baosight/hggp/hg/constant/HGConstant.java
