beauty-erp.git - Gitblit

summary
reflog
commits
tree
docs
forks
compare

935090232@qq.com

2021-06-03 cfb8dfcae63e6706d088201aed486d2dbf5014a9

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

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