zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
@@ -97,7 +97,7 @@ @Override public boolean isInWorkTime(Long shopId, Date beginTime, Date endTime) { if(beginTime==null){ if(beginTime!=null){ Date minTime = findMinTime(shopId); Date maxTime = findMaxTime(shopId); minTime.setYear(beginTime.getYear());