Merge branch 'test' into 'test_screen'

罗元桥

2021-06-18 99ca25c5d2ee1e4d050f3aee96757bdfea195fc6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java

@@ -158,7 +158,7 @@


    @Select("<script> " +
            " SELECT t.id, t.yearMonth, au.`type`,  DATE_FORMAT(au.CREATE_AT,'%Y-%m-%d')  AS create_at,\n" +
            " SELECT distinct t.id, t.yearMonth, au.`type`,  DATE_FORMAT(au.CREATE_AT,'%Y-%m-%d')  AS create_at,\n" +
            " case " +
            " when fed.id IS NOT NULL then true\n" +
            " ELSE false " +