Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

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