From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java
index 01d529e..2f018b3 100644
--- a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java
+++ b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java
@@ -37,6 +37,24 @@
     R<Agreement> dataInfo(@RequestParam("type") Integer type);
 
     /**
+     * 获取司机操作指南
+     *
+     * @return 详情操作指南
+     */
+    @GetMapping(value = "/agreement/operate")
+    R<Agreement> operate();
+
+    /**
+     * 根据类型获取注册协议、隐私政策
+     * -- 用户端远程调用
+     *
+     * @param type 查询类型
+     * @return 详情
+     */
+    @GetMapping(value = "/agreement/agreementPolicy")
+    R<Agreement> agreementPolicy(@RequestParam("type") Integer type);
+
+    /**
      * 系统通知列表
      *
      * @return 通知公告列表
@@ -85,7 +103,7 @@
      * @return 奖品列表
      */
     @GetMapping(value = "/prize/prizeList")
-    R<List<Prize>> prizeList();
+    R<List<Prize>> prizeList(@RequestParam("serveId") Integer serveId);
 
     /**
      * 奖品详情 -- 远程调用
@@ -113,4 +131,7 @@
     @GetMapping(value = "/franchisee/cityDetail")
     R<List<String>> cityDetail(@RequestParam("id") Integer id);
 
+    @GetMapping(value = "/franchisee/getWorkPic")
+    R<String> getWorkPic(@RequestParam("id") Integer id);
+
 }

--
Gitblit v1.7.1