Merge branch 'master-prod-new' into master-test

chenjiahe

2024-02-23 1468baceb9b0f168a76b999dcf9e724c49d100c8

 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;