Merge remote-tracking branch 'origin/fhx-base-预约整合0808' into master-xlk

fhx

2024-08-12 1cc8d819402db6729edcd2cf0349ae8ab1a84ce0

 phis-feign/src/main/java/com/hz/his/dto/user/UserUnionDto.java

@@ -16,7 +16,7 @@
    private String fromCode;

    /**
     * 来源名称
     * 来源名称/来源路径
     */
    private String fromName;