Merge branch 'dev' of humingfen/wlyy2.0 into dev

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/statics/StatisticsUtilService.java

@@ -251,9 +251,9 @@ public class StatisticsUtilService {
     */
    public void sortDoubleList(List<Map<String,Object>> resultList, String sortName){
        resultList.sort((x,y)->{
            if ( (Double) x.get(sortName) > (Double) y.get(sortName)) {
            if ( (Long) x.get(sortName) > (Long) y.get(sortName)) {
                return 1;
            } else if ((Double) x.get(sortName) < (Double) y.get(sortName)) {
            } else if ((Long) x.get(sortName) < (Long) y.get(sortName)) {
                return -1;
            } else {
                return 0;