Merge remote-tracking branch 'origin/master'

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ShiftResultServiceImpl.java

@@ -195,8 +195,8 @@ public class ShiftResultServiceImpl extends ServiceImpl<ShiftResultMapper, Shift
                 resultEntity.setMonth(month);
 
                 // 计算工作小时数
-                int shiftHour = calculateHours(config.getBgnDtime(), config.getEndDtime());
+//                int shiftHour = calculateHours(config.getBgnDtime(), config.getEndDtime());
-                resultEntity.setShiftHour(shiftHour);
+                resultEntity.setShiftHour(shiftsPerDay==3?8:12);
 
                 shiftResultList.add(resultEntity);
             }