Merge branch 'test' into 'test_bak'

罗元桥

2021-09-07 4b50ee7687be0c63bb5639156e4a3f6a15aaf37a

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

@@ -24,7 +24,7 @@
        + "<if test='pageActWorkGuideDTO.classify != null'>"
        + "and classify = #{pageActWorkGuideDTO.classify} " + " </if> "
        + "<if test='pageActWorkGuideDTO.title != null and pageActWorkGuideDTO.title.trim() != &quot;&quot;'>"
        + "and title like concat('%',#{pageActWorkGuideDTO.title},'%')" + " </if> " + " </where>" + "order by update_at asc"
        + "and title like concat('%',#{pageActWorkGuideDTO.title},'%')" + " </if> " + " </where>" + "order by update_at desc"
        + "</script>")
    IPage<ComActWorkGuideVO> pageWorkGuide(Page page,
        @Param("pageActWorkGuideDTO") PageActWorkGuideDTO pageActWorkGuideDTO);