Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-11 77fc2a36ea89c8d31d9f24f1fe688273d6484abc

Merge branch 'zhaozhengjie1104' into test

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -135,7 +135,7 @@
        AND last_login_time > DATE_FORMAT( date_sub( SYSDATE(), INTERVAL 0 DAY ), '%Y-%m-%d 00:00:00')) as dayNum
        FROM
        com_act a
        LEFT JOIN sys_user u ON a.community_id = u.community_id and u.type=1
        LEFT JOIN sys_user u ON a.community_id = u.community_id and u.type=1 where a.area_code = '510423'
        GROUP BY a.community_id)t ORDER BY t.num desc
    </select>

@@ -470,7 +470,7 @@
                AND ca.street_id = cs.street_id
            ) AS userNum
        FROM
            `com_street` AS cs
            `com_street` AS cs where area_code='510423'
            order by userNum desc
    </select>