Merge branch 'master-prod-new' into master-fwq抽奖配置

fwq

2023-10-07 9f6e37f3d6320fa5b3f4f30bc9bd7c357eeb96e7

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

@@ -12,5 +12,6 @@
    private String applyId;
    /**审核标识*/
    private String examineId;

    /**是否直接通过:0否1是*/
    private Integer isPass;
}