fhx
2024-10-10 01e3bc6ab8919b4284e43fbbb1be57291deac943
refs
用户 fhx <308050795@qq.com>
星期四, 十月 10, 2024 10:31 +0800
提交者 fhx <308050795@qq.com>
星期四, 十月 10, 2024 10:31 +0800
提交01e3bc6ab8919b4284e43fbbb1be57291deac943
目录 90cad791c75af95a027086773b82f3ee9524001f 目录 | zip | gz
parent 3bd962fc957f6745bba479900e29f6e4ae399aa1 查看 | 对比
ce55d2d990753e1f19b05bf5b99180d3cf6b2e78 查看 | 对比
Merge remote-tracking branch 'origin/fhx-base-医助需求1008' into master-test

# Conflicts:
# phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java
# phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java
# phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java
# phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipAppAutoMateService.java
1个文件已添加
6个文件已修改
64 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentAutoMateDto.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentDto.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentV2Dto.java 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/role/SysCommonRoleDto.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipAppointmentService.java 1 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipAppAutoMateService.java 1 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/appointment/SPhipCrmSelfV2Service.java 51 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史