Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-29 d2542a6123fa6834e01ed3af23c7ba0a02696bc6

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TechnicianSubscribeMapper.java

@@ -2,6 +2,10 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.other.api.domain.TechnicianSubscribe;
import com.ruoyi.other.vo.TechnicianSubscribeVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +17,13 @@
 */
public interface TechnicianSubscribeMapper extends BaseMapper<TechnicianSubscribe> {

    /**
     * 查看用户预约记录
     * @param shopId
     * @return
     */
    public List<TechnicianSubscribeVO> getTechnicianSubscribeByUserAndShop(@Param("userId") Long userId,
                                                                           @Param("shopId") Long shopId);
    public List<TechnicianSubscribeVO> getTechnicianSubscribeByUser(@Param("userId") Long userId,
                                                                           @Param("status") Integer status);
}