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

wzy

2021-01-26 c42165204bda966c32f6c5e6cba7a978e08922e7

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

  
}