Merge branch 'master-prod-new' into master-test

fhx

2024-05-18 cb698b6c5a1ebeeb1efdff4b8ca62f00f4612b85

 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;