Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-05-08 b18e73eaff86abc48b5d458efa86d685b6a4b4fb

 phis-feign/src/main/java/com/hz/phis/dt/card/CardDt.java

@@ -1,17 +1,14 @@
package com.hz.phis.dt.card;

import com.hz.his.dto.PageDto;

/**卡项扩展*/
public class CardDt extends PageDto {
    /**更新时间*/
    private String editTime;
import lombok.Data;

    public String getEditTime() {
        return editTime;
    }

    public void setEditTime(String editTime) {
        this.editTime = editTime;
    }
/**
 * 卡项列表实体
 *
 * @author fwq
 */
@Data
public class CardDt {
    private CardDetailListDt cardItem;
}