Merge branch 'master' into master-test

wangrenhuang

2023-04-21 88266975b971203030b35aee074dc89d4ce9dafe

 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;