Merge branch 'rx-1116-营销生日券' into master-prod-new

rx

2023-11-22 e8bba077c22ca0507b21d463dc9ec2ac922835de

 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;