Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java

 
                 // 注册数
                 Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(CommConstant.PERSON_REALTY_CONSULTANT);
-                Map<String, Object> user = new HashMap<>();
-                user.put("user_count", selectUserCount);
-                user.put("registered_count", selectRegisteredCount);
-                result.put("data_count", selectRegisteredCount);
+                Map<String, Object> userMap = new HashMap<>();
+                userMap.put("pvNum", selectUserCount);
+                userMap.put("registeredCount", selectRegisteredCount);
+                result.put("data_count", userMap);
                 break;
         }