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

fwq

2023-11-20 5fdc811da1c6af27d655408577a79ce6bd046904

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

 phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java

@@ -8,10 +8,13 @@
 */
@Data
public class MarketingResultDto {
    /**营销助手项目的标识*/
    /**营销助手唯一标识*/
    private String applyId;
    /**审核标识*/
    private String examineId;
    /**唯一标识*/
    private String uniqueId;
    /**是否直接通过:0否1是,如果是直接通过则不再回调MarketingReturnDto*/
    private Integer isPass;
    /**审核标识*/
    private String examineId;

}

 phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java

@@ -2,6 +2,7 @@

import lombok.Data;

import java.util.Date;
import java.util.List;

/**
@@ -14,6 +15,12 @@
    private Integer type;
    /**用户标识*/
    private String userId;
    /**点诊时间开始*/
    private Date startTime;
    /**点诊时间结束*/
    private Date endTime;
    /**点诊原因类型*/
    private String reasonType;
    /**备注*/
    private String operatorRemark;
    /**科室关系Json*/