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

jiangping

2025-02-21 1147614053efae0314a36c15293a6a5ed4e6d737

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

@@ -5,6 +5,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.DiscountMember;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.vo.GoodsorderExportVO;
@@ -208,4 +209,5 @@

    void autoCancelRefunOrder();

    DiscountMember getUseDiscount(String memberId, Integer driveTime);
}