Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

wzy

2021-01-30 5a5e18d266370a7717db57c7275468868f29ed8e

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