Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

rx

2023-10-26 e0a35f3912912fb3a160ee2633594a2e6c828abc

 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;