From 7496c0532947ef59165a91077e3ece78c8d3bb06 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 07 八月 2024 16:41:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
index eec3e3d..4630bf6 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -1,10 +1,13 @@
 package com.ruoyi.other.api.feignClient;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.dto.TagListQueryDto;
 import com.ruoyi.account.api.dto.UnitListQueryDto;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.api.domain.TUserTag;
+import com.ruoyi.other.api.factory.GoodsFallbackFactory;
 import com.ruoyi.other.api.factory.OtherFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,12 +20,24 @@
  */
 @FeignClient(contextId = "UnitClient", value = ServiceNameConstants.CONTRACT_SERVICE, fallbackFactory = OtherFallbackFactory.class)
 public interface OtherClient {
-
+    //单位分页
     @PostMapping(value = "/t-company/unit/page")
     R<Page<TCompany>> queryUnitPage(@RequestBody UnitListQueryDto unitListQueryDto);
-
+    //单位添加修改
     @PostMapping(value = "/t-company/unit/addOrUpdate")
     R unitAddorUpadate(@RequestBody TCompany tCompany);
+    //单位删除
     @PostMapping(value = "/t-company/unit/delete")
     R unitDelete(@RequestParam Integer id);
+
+
+    //标签分页
+    @PostMapping(value = "/t-user-tag/page")
+    R<Page<TUserTag>> queryTagPage(@RequestBody TagListQueryDto unitListQueryDto);
+
+    //用户新增标签
+    @PostMapping(value = "/t-user-tag/addorUpdateTag")
+    R addorUpdateTag(@RequestBody TUserTag tUserTag);
+    @PostMapping(value = "/t-user-tag/delete")
+    R deleteTag(@RequestParam Integer id);
 }

--
Gitblit v1.7.1