From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/base/MyBaseActivity.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/base/MyBaseActivity.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/base/MyBaseActivity.java
index dfab7c0..b9533e3 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/base/MyBaseActivity.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/base/MyBaseActivity.java
@@ -103,7 +103,7 @@
             if(isFinishing()){
                 return;
             }
-            timeChange(String.format(getString(R.string.time_djs),millisUntilFinished/1000));
+            timeChange((millisUntilFinished/1000)+"s");
         }
     };
 

--
Gitblit v1.9.3