From 06180fa3c8ee17d731561b88897fa18b9f8cf228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 04 十一月 2022 17:53:50 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into local_20221104

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java
index b91cdea..ea27886 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComBatteryCommodityOrderMapper.java
@@ -10,6 +10,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * title: 电动车商城-订单表表数据库访问层
@@ -54,5 +55,9 @@
      * @date 2022-03-29 16:05:36
      */
     List<ComBatteryCommodityOrderVo> queryAllByList(@Param("dto") PageComBatteryCommodityOrderDto comBatteryCommodityOrder);
+
+    ComBatteryActivityTeamVo queryTeamIdByUserId(@Param("userId") Long userId, @Param("activityId") Long activityId);
+
+    ComBatteryActivityTeamVo queryTeamIdByUserIdBargain(@Param("userId") Long userId, @Param("activityId") Long activityId);
 }
 

--
Gitblit v1.7.1