From 4f3dc0921552ed9434bab7d2e2cde301e350c90d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 27 四月 2023 18:49:01 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-prod-new-优惠券校验
---
phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java | 18 ++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java | 4 ++++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
index 39bea7a..ab01413 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopReportDto.java
@@ -14,10 +14,14 @@
private String shopId;
/**褰撳墠鏃堕棿*/
private String nowTime;
+ /**鏄惁鏃堕棿娈电瓫閫�*/
+ private Integer isSelectPeriod = 0;
/**寮�濮嬫椂闂�*/
private String startTime;
/**缁撴潫鏃堕棿*/
private String endTime;
+ /**娌夌潯鏃堕棿*/
+ private String sleepTime;
/**闂ㄥ簵鍒楄〃鏍囪瘑*/
private List<String> shopIdList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java
new file mode 100644
index 0000000..9798b47
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java
@@ -0,0 +1,18 @@
+package com.hz.his.feign.service.phisAdmin;
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phis-service", contextId = "labelInfo")
+public interface SLabelInfoService {
+
+ /**
+ * 鏍囩鍒嗙被鏍戝瀷鍒楄〃(鎼滅储)
+ */
+ @RequestMapping("/foreign/api/user/label/type/tree/list")
+ Result userLabelTypeTreeList();
+}
\ No newline at end of file
--
Gitblit v1.8.0