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

Andru

2023-11-14 2dd671e816b8a840a5981713effc72977e2795aa

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

* master-prod-new:
  注释
  1.新增字段
  新增接口

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

@@ -12,14 +12,15 @@

    /******MarketingDto继承字段 -必填项****/

    /**审核类型 >1000的值 (参考m_application_subject) -必填项*/
    private Integer type;
    /**审核类型唯一字符串  -必填项*/
    private String typeStr;
    /**审核标题  -必填项*/
    private String title;

    /**审核唯一标识 -必填项*/
    private String uniqueId;
    /**审核标题  -必填项*/
    private String title;
    /**审核类型 >1000的值 (参考m_application_subject,不可重复) -必填项*/
    private Integer type;
    /**审核类型唯一字符串*/
    private String typeStr;

    /**审批界面展示的内容 -必填项*/
    private MarketingContentDto marketingContentDto;
@@ -27,7 +28,7 @@
    /**消息发送内容  -必填项*/
    private MarketingMsgDto marketingMsgDto;

    /**回调链接  -必填项  回调传参*/
    /**回调链接  -必填项  回调参数参考MarCommonReturnDto*/
    private String callbackUrl;

}

 phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java

@@ -30,6 +30,8 @@
    private String platformType;
    /** 操作人角色id(EmployeeRole) */
    private String opRoleId;
    /** 到访订单id */
    private String visitOrderId;

    private List<MicroPlanDto> planList;
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java

@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform;

import com.hx.resultTool.Result;
import com.hz.his.dto.marketing.common.MarketingTotalDto;
import com.hz.his.dto.user.*;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.project.UserProjectDto;
@@ -134,4 +135,9 @@
    @PostMapping(value = "/user/room/doctor/diagnosis/create")
    Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);

    /**
     * 开放平台-转发创建营销助手审核
     */
    @PostMapping(value = "/user/common/approve/create")
    Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);
}