From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期二, 14 十一月 2023 09:14:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java index a9439b1..66d5665 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java @@ -30,9 +30,9 @@ @Param("state")Integer state, @Param("page")Page<Map<String, Object>> page, @Param("cityCode") String cityCode, - @Param("storeId")Integer storeId - - ); + @Param("storeId")Integer storeId, + @Param("operatorId")Integer operatorId, + @Param("objType")Integer objType); List<Map<String, Object>> queryCouponListOfSearch1(@Param("name")String name, @Param("type")Integer type, -- Gitblit v1.7.1