Merge branch 'fhx-prod-用户建档' into master-test

fhx

2023-08-01 f41afc204087959897d8fe993d8965d2346be67c

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java

@@ -19,6 +19,7 @@
@Data
public class EmployeeVo {

    private String id;
    private String unionId;

    private String userId;