fwq
2024-05-09 17c959c9ba3966d251ccc555f1215175fdccdf97
Merge branch 'master-prod-new' into master-test
2个文件已修改
8 ■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/user/room/UserDoctorRoomDto.java
@@ -35,5 +35,4 @@
    private String opRoleName;
    private String opRoleTypeId;
    private String opRoleStr;
}
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.MarCommonReturnDto;
import com.hz.his.dto.marketing.common.MarketingTotalDto;
import com.hz.his.dto.user.*;
import com.hz.his.dto.user.coupon.UserCouponDto;
@@ -136,6 +137,12 @@
    Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
    /**
     * 开放平台-用户科室点诊审核回调
     */
    @PostMapping(value = "user/room/doctor/diagnosis")
    Result diagnosisFamiliesRoom(@RequestBody MarCommonReturnDto marCommonReturnDto);
    /**
     * 开放平台-转发创建营销助手审核
     */
    @PostMapping(value = "/user/common/approve/create")