Merge branch 'master' into master-test

wangrenhuang

2023-05-22 3c578c4e372a259f62832bdb72589128f211f074

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

@@ -9,6 +9,8 @@
public class EmployeeSchedule   {


    private String id;

    private String shopId;

    private String shopName;