Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/util/hibernate/HibenateUtils.java

@@ -228,7 +228,7 @@ public class HibenateUtils {
                        if(value.getClass().getName().equals("java.lang.Integer") && field.getName().equals("slaveKey1")){
                            value = value.toString();
                        }
                        if(field.getName().equals("slaveKey2")){
                        if(field.getName().equals("slaveKey1")||field.getName().equals("slaveKey2")||field.getName().equals("slaveKey3")){
                            value = value.toString();
                        }
                    }