Merge branch 'master' into 'test'

罗元桥

2021-07-31 3d88bf929fc637a898ea0ca3e64cd6c1ec26a182

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

@@ -23,7 +23,7 @@
            "title like concat('%',#{pageActWorkGuideDTO.title},'%')"+
            " </if> " +
            " </where>" +
            "order by update_at desc"+
            "order by update_at asc"+
            "</script>")
    IPage<ComActWorkGuideVO> pageWorkGuide(Page page, @Param("pageActWorkGuideDTO") PageActWorkGuideDTO pageActWorkGuideDTO);
}