Merge branch 'score_shop' into api_score_meger

jyy

2021-07-27 7ef344dbe8fa92d479477d3cec483872f8080b77

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

  
}