Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityOrderCollageTeamService.java

@@ -63,7 +63,7 @@
     * @author lyq
     * @date 2022-03-29 16:06:57
     */
    R detailById(Long id);
    R detailById(Long id,Long userId);

    /**
     * description  queryByPage  查询列表
@@ -75,4 +75,11 @@
     */
    R queryByList(PageComBatteryCommodityOrderCollageTeamDto comBatteryCommodityOrderCollageTeam);

    /**
     * 创建拼团订单
     * @param orderDto  请求参数
     * @return  创建订单结果
     */
    R startFight(StartFightOrderDto orderDto);

}