Merge branch 'score_shop' into api_score_meger

jyy

2021-06-09 050a6e05bf85df074d24e9f5e06cc0d618019ccc

 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);

  
}