Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-06 abe25c659140b8c3f4db90ce943f4143a7d7f40f

 zq-erp/src/main/java/com/matrix/system/hive/service/SysBeauticianStateService.java

@@ -75,7 +75,7 @@
   public List<SysBeauticianState> findByTimeAndStaff(Long id, Date beginTime, Date endTime);


   	
      public List<SysBeauticianState> findBySerId(Long serviceId);

  
}