fhx
2023-11-14 262d511f52c7530f6f3ddbf595264f9880b4df4f
Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
2个文件已修改
8 ■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
@@ -16,7 +16,7 @@
     * 统一申请审核接口
     */
    @PostMapping(value = "/common/apply")
    Result applyOrderDiscount(@RequestBody MarketingTotalDto marketingTotalDto);
    Result commonApply(@RequestBody MarketingTotalDto marketingTotalDto);
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);
}