-
Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev · b22eefd2
# 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
yukang authored
