Merge remote-tracking branch 'origin/master'

doum

昨天 2da6cac0a9bab5ce7ad04ac17f73d456732f907e

 server/dmmall_admin/src/main/java/com/doumee/api/common/HomeContrller.java

@@ -61,7 +61,7 @@
        //用户总数
        MPJLambdaWrapper<Member> memberWrapper = new MPJLambdaWrapper<>();
        memberWrapper.eq(Member::getIsdeleted,Constants.ZERO);
        Integer memberCount=memberJoinMapper.selectCount(memberWrapper);
        long memberCount=memberJoinMapper.selectCount(memberWrapper);
        json.put("memberCount",memberCount);

        //今日活动用户；