Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

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

@@ -21,7 +21,10 @@

    @Select("<script> " + "select * from com_mng_vaccines" + " <where>"
        + "<if test='vaccinesByAdminDTO.name != null and vaccinesByAdminDTO.name != &quot;&quot;'>"
        + "`name` like concat('%',#{vaccinesByAdminDTO.name},'%') " + " </if> " + " </where>"
        + "`name` like concat('%',#{vaccinesByAdminDTO.name},'%') " + " </if> "
        + "<if test='vaccinesByAdminDTO.areaCode != null and vaccinesByAdminDTO.areaCode != &quot;&quot;'>"
        + "`area_code` = #{vaccinesByAdminDTO.areaCode} " + " </if> "
        + " </where>"
        + " order by create_at desc" + " </script>")
    IPage<VaccinesByAppVO> getVaccinesByName(Page page,
        @Param("vaccinesByAdminDTO") VaccinesByAdminDTO vaccinesByAdminDTO);