# Conflicts: # src/main/java/com/baosight/hggp/common/DdynamicEnum.java # src/main/java/com/baosight/hggp/hg/constant/HGConstant.java # src/main/java/com/baosight/hggp/hg/pz/tools/HGPZTools.java # src/main/resources/resources/ibatis/sqlmap-config.xml
