Merge branch 'master-fwq-积分抵扣现金' into master-test

fwq

2024-04-23 bdd39fac56c367b36d6c41ef2cd5c9f35926013f

 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;