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

rk

2 天以前 69758b26403c3c97ad35c2c76125a1ff36a3e9d0

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