Merge remote-tracking branch 'origin/dev-shaoyf' into dev-shaoyf

kernel/src/main/java/com/lantone/qc/kernel/util/CatalogueUtil.java

@@ -228,7 +228,7 @@ public class CatalogueUtil {
             time_e = calendar_e.getTimeInMillis();
 
             time_diff = (time_e - time_s) / (1000 * 60);
-            if (time_diff >= diff) {
+            if (time_diff > diff) {
                 overtime = true;
             }
         } catch (Exception e) {