Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-22 5c64643fb7ef2650d67bd7bef4e7965ef8f49800

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

@@ -232,7 +232,7 @@
            "<if test='pageComShopFundsSearchDTO.orderNo != null '>" +
            " AND sr.order_no = #{pageComShopFundsSearchDTO.orderNo} " +
            " </if> " +
            " GROUP BY sr.id ORDER BY sr.create_at "+
            " GROUP BY sr.id ORDER BY sr.create_at DESC "+
            "</script>")
    IPage<ComShopFundsOrderVO> pageShopFunds(Page page, @Param("pageComShopFundsSearchDTO") PageComShopFundsSearchDTO pageComShopFundsSearchDTO);