Merge remote-tracking branch 'origin/master-test' into master-test

fwq

2023-08-16 6939a2e9d54f37bbe58572942105f9f65e5132fd

 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;
}