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

rk

3 小时以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 server/services/src/main/java/com/doumee/service/business/DiscountService.java

@@ -87,6 +87,7 @@
     */
    PageData<Discount> findPage(PageWrap<Discount> pageWrap);

    void dealPrice(Discount discount);
    /**
     * 条件统计
     *
@@ -94,4 +95,6 @@
     * @return long
     */
    long count(Discount discount);

    void updStatus(Discount discount);
}