parent: 3ce37411 | patch | commit | ignore whitespace
xiaoyong931011
2021-04-08 d6e902a48df4264d6dbf6ff0c9799c3c30c9d9ff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
1 files modified
2 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java 2 ●●●●● patch | view | raw | blame | history 
 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());