Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-22 fca1cdb24e4b0763f4386416494a39176262839b

Merge remote-tracking branch 'origin/master'

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

@@ -82,7 +82,7 @@
                " AND ss.sys_user_id = #{pageComShopOrderSearchDTO.storeUserId} " +
                " </if> " +
            " GROUP BY sr.id " +
            " ORDER BY sr.create_at "+
            " ORDER BY sr.create_at DESC "+
            "</script>")
    IPage<ComShopOrderSearchVO> pageOrderBy(Page page, @Param("pageComShopOrderSearchDTO")  PageComShopOrderSearchDTO pageComShopOrderSearchDTO);