Merge branch 'score_shop' into api_score_meger

jyy

2021-09-25 4f4fd43c199ff802df896256bc012a7277fdd4a1

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

@@ -93,7 +93,9 @@
   
      return sysBeauticianStateDao.selectByTimeAndStaff(id,beginTime,endTime);
   }
	
   	
	

   @Override
   public List<SysBeauticianState> findBySerId(Long serviceId) {
      return sysBeauticianStateDao.selectBySerIds(serviceId);
   }
}