Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-06-23 4cb590cfe7bc615207bd7fdfcf30295a038e470e

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