Merge branch 'txb'

tangxiaobao

2021-08-13 8a6375edade9f1edc194a0381369fe94e56c13c7

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

@@ -176,7 +176,7 @@
                " AND sr.order_no = #{comShopFundsExportDTO.orderNo} " +
                " </if> " +
            " </if> " +
            " GROUP BY sr.id ORDER BY sr.create_at "+
            " GROUP BY sr.id ORDER BY sr.create_at DESC "+
            "</script>")
    IPage<ExcelShopFundsDTO> selectFundsExport(Page page, @Param("comShopFundsExportDTO") ComShopFundsExportDTO comShopFundsExportDTO);