Merge branch 'gyj' into test

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopAdServiceImpl.java

@@ -96,6 +96,8 @@ public class TbShopAdServiceImpl extends ServiceImpl<TbShopAdMapper, TbShopAd> i
             return ResponseEntity.badRequest().body("店铺ID不能为空");
         }
 
+        wrapper.eq("shop_id", params.get("shopId"));
+
         if (StrUtil.isNotBlank((String) params.get("status"))) {
             wrapper.eq("status", params.get("status"));
         }