Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fhx

2023-10-10 2cd54a74f83835604df8f9774fe0f0172f514fac

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

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

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