Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -23,7 +23,7 @@
            " and a.name LIKE concat( #{pageComCvtCategoryDTO.name}, '%' )  " +
            " </if> " +
            " </where>" +
            " order by a.create_at desc"+
            " order by a.weight desc"+
            "</script>")
    IPage<ComCvtCategoryVO> pageComCvtCategory(Page page, @Param("pageComCvtCategoryDTO") PageComCvtCategoryDTO pageComCvtCategoryDTO);