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/ComBatteryCommodityActivityService.java

@@ -2,6 +2,7 @@

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * title: 电动车商城-商家活动表表服务接口
@@ -59,11 +60,12 @@
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @param userId 用户id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-29 13:17:40
     */
    R detailById(Long id);
    R detailById(Long id,Long userId);

    /**
     * description  queryByPage  查询列表
@@ -83,4 +85,5 @@
     */
    R updateStatus(Long id,Integer status);


}