Merge branch 'chenjiahe-爆款活动' into master-test

fwq

2024-02-29 a567cfc2780c634d886e49dc10b589982491ec12

 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;