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

rx

2023-11-20 14fe56337998458322ee4cd6ec8f284490e69df9

 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;