Merge branch 'dev' into test

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicPrintTemplateClient.java

@@ -23,8 +23,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.Map;
-
 /**
  * 打印模板信息 Feign接口类
  *
@@ -32,7 +30,7 @@ import java.util.Map;
  * @since 2023-05-15
  */
 @FeignClient(
-    value = ModuleNameConstant.APPLICATION_BASIC_NAME+"-tjj"
+    value = ModuleNameConstant.APPLICATION_BASIC_NAME
 )
 public interface IBasicPrintTemplateClient {
 

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicTenantCodeClient.java

@@ -35,7 +35,7 @@ import java.util.List;
  * @since 2023-05-08
  */
 @FeignClient(
-	value = ModuleNameConstant.APPLICATION_BASIC_NAME+"-tjj"
+	value = ModuleNameConstant.APPLICATION_BASIC_NAME
 )
 public interface IBasicTenantCodeClient {