Merge branch 'master-prod-new' into master-prod-new-优惠券校验

fwq

2023-04-27 4f3dc0921552ed9434bab7d2e2cde301e350c90d

Merge branch 'master-prod-new' into master-prod-new-优惠券校验

 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;
}

 phis-feign/src/main/java/com/hz/his/feign/service/phisAdmin/SLabelInfoService.java

New file
@@ -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 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phis-service", contextId = "labelInfo")
public interface SLabelInfoService {

    /**
     * 标签分类树型列表(搜索)
     */
    @RequestMapping("/foreign/api/user/label/type/tree/list")
    Result userLabelTypeTreeList();
}