Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

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

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

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