Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-11 ef82a7dd65015afb75c9a8ab0beb508adc66d9c9

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

@@ -39,7 +39,7 @@
            " LEFT JOIN com_act t1 ON t.community_id = t1.community_id " +
            " LEFT JOIN com_mng_struct_area t2 ON t2.id = t.area_id " +
            " LEFT JOIN sys_user t3 ON t.create_by = t3.user_id " +
            " WHERE t.source =2 " +
            " WHERE 1=1" +
            "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name.trim() != &quot;&quot;'>" +
            " and t.user_name LIKE concat( '%',#{pageComMngCarDTO.name}, '%' )  " +
            " </if> " +