Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2024-02-23 e7d554f4f8f79eafaa2de3abe036d21e300fd14a

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

 phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java

@@ -1,5 +1,6 @@
package com.hz.his.dto.promotion;

import com.hz.his.dto.PageDto;
import lombok.Data;

/**
@@ -7,7 +8,7 @@
 * @author fwq
 * */
@Data
public class PromotionDto {
public class PromotionDto extends PageDto {

    /**更新时间*/
    private String editTime;

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

@@ -52,4 +52,11 @@
     */
    @PostMapping(value = "/cardItem/update/list")
    Result getUpdateCardItem(@RequestBody CardDto cardDto);

    /**
     * 获取暂停和结束销售的卡项
     * @return Result
     */
    @PostMapping(value = "/cardItem/noUp/list")
    Result noUpList(@RequestBody CardDto cardDto);
}

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

@@ -41,4 +41,8 @@
    /**获取促销更新列表*/
    @PostMapping(value = "/promotion/update/list")
    Result getUpdatePromotion(@RequestBody PromotionDto promotionDto);

    /**获取暂停和结束销售的促销*/
    @PostMapping(value = "/promotion/noUp/list")
    Result noUpList(@RequestBody PromotionDto promotionDto);
}