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

doum

2 天以前 0f56aa60f9d6a779790f5f490cc8d3f3a39cf4aa

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