'commit'

src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java

@@ -261,7 +261,10 @@ public class ExamModel {
         res.set("second", second);
         String ys = "";
         if (hour > 0) ys += hour + "小时";
-        ys += minute + "分钟";
+
+        if (hour == 0 && minute > 0) ys += minute + "分钟";
+        if (hour > 0) ys += minute + "分钟";
+
         if (second > 0) ys += second + "秒";
         res.set("ys", ys);
         return res;