Merge remote-tracking branch 'origin/master-test' into master-test

zhangxu

2022-12-02 596fbb32e2a26579b66818e33ed472d74c1c070a

 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;