Merge branch 'master' of http://gogs.chelvc.com/wuyongqiang/admin

src/main/java/com/chelvc/cloud/admin/controller/UserController.java

@@ -82,8 +82,9 @@ public class UserController {
         Map<String, Object> userRegisterCount = this.userClient.getUserRegisterReportDaily(
                 param.getYear(), param.getMonth(), param.getType(), param.getDay()
         );
+        Map<String, Object> merchantCount = this.merchantClient.getMerchantReportCount(param);
         map.put("userRegisterCount", ObjectUtils.ifNull(userRegisterCount.get("registerCount"), 0));
-        map.put("merchant", this.merchantClient.getMerchantReportCount(param));
+        map.put("merchantRegisterCount", ObjectUtils.ifNull(merchantCount.get("registerCount"), 0));
         return map;
     }