Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fwq

2023-12-06 b020f119176dcc1c60ec1c97bd03d9a3efe8b5fa

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

@@ -56,6 +56,13 @@
    private String activityCouponId;
    /** 营销活动分组id */
    private String groupId;
    /** 营销活动领取记录子项itemid */
    private String recordItemId;
    /**审核状态 查询 0=无需审批 1=待审批 2=审批成功 3=审批失败*/
    private Integer approvalStatus;
    /**审批状态 通过=agree 拒绝=reject*/
    private String statusStr;


    /** 平台类型(PlatformConstants) */
    private String platformType;