Merge branch 'master-fwq积分限购' into master-test

fwq

2023-07-18 68df9ddab1b929c58ff5cf95c6487e9220397193

 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;