Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 a8ba074e4b0807cee707614a55e31e34ea0fbbde

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

@@ -67,6 +67,7 @@
            "AND #{pageComOpsAdvDTO.offAtEnd}"+
            " </if> " +
            " </where>" +
            " order by a.create_at desc" +
            "</script>")
    IPage<ComOpsAdvVO> pageAdvertisement(Page page, @Param("pageComOpsAdvDTO") PageComOpsAdvDTO pageComOpsAdvDTO);
    @Select("SELECT \n" +
@@ -86,6 +87,6 @@
            "JOIN com_ops_adv_pos po on a.pos_id=po.id\n" +
            "LEFT JOIN com_ops_adv_jump p on a.jump_id=p.id\n" +
            "WHERE\n" +
            "a.id=#{id} ")
            "a.id=#{id} " )
    ComOpsAdvVO detailAdvertisement(Long id);
}