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

fwq

2023-11-20 b8a33ff73ce960d5604f3a1e9613323d4069e773

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

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

@@ -15,7 +15,7 @@
    private String time;
    /**sign*/
    private String sign;
    /**返回数据  可参考MarketingReturnDto*/
    /**返回数据  可参考MarketingResultDto 和 MarketingReturnDto*/
    private String data;



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

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