Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

2025-10-31 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

 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");
        }
    };