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

jiaosong

2023-10-09 f46cdb919bc12c48b13d3b4e595dc136ee987358

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

@@ -3,6 +3,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.dao.business.web.response.MemberRidesQuery;

import java.util.List;

/**
@@ -14,7 +17,7 @@

    /**
     * 创建
     * 
     *
     * @param memberRides 实体对象
     * @return String
     */
@@ -78,14 +81,14 @@
     * @return List<MemberRides>
     */
    List<MemberRides> findList(MemberRides memberRides);
  

    /**
     * 分页查询
     *
     * @param pageWrap 分页对象
     * @return PageData<MemberRides>
     */
    PageData<MemberRides> findPage(PageWrap<MemberRides> pageWrap);
    PageData<MemberRidesDTO> findPage(PageWrap<MemberRidesQuery> pageWrap);

    /**
     * 条件统计