-
Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into dev-sx · c73161c2
Conflicts: src/main/java/com/baosight/hggp/hg/constant/HGConstant.java src/main/java/com/baosight/hggp/hg/kc/domain/HGKC014.java src/main/java/com/baosight/hggp/hg/kc/domain/HGKC014A.java src/main/java/com/baosight/hggp/hg/kc/tools/HGKCTools.java
宋祥 authored
