Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

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

@@ -68,6 +68,12 @@
            "<if test='vaccinesByAdminDTO.communityId != null'>" +
            " and cmver.community_id = #{vaccinesByAdminDTO.communityId} "+
            " </if> " +
            "<if test='vaccinesByAdminDTO.ids != null and vaccinesByAdminDTO.ids.size > 0'>" +
            " and cmver.id in " +
            "<foreach item=\"item\" collection=\"vaccinesByAdminDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n" +
            "#{item}" +
            "</foreach>" +
            " </if> " +
            "<if test='vaccinesByAdminDTO.vaccines != null and vaccinesByAdminDTO.vaccines != &quot;&quot;'>" +
            " and cmv.name = #{vaccinesByAdminDTO.vaccines} "+
            " </if> " +