Merge branch 'master-fwq-积分抵扣现金' into master-prod-new

fwq

2024-05-01 623afb6fbb8ce6adebf237e7b670d9f4f339184d

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

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

}