Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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

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