Merge branch 'master' into master-test

fwq

2023-06-26 fc9cac864414b566e3516f6702b716e8ed00e9dc

 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;