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

rk

2 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 keyCabinet-android/app/src/test/java/com/doumee/ticketmachine/ExampleUnitTest.java

@@ -1,5 +1,7 @@
package com.doumee.ticketmachine;

import android.text.TextUtils;

import com.doumee.keyCabinet.MApplication;
import com.doumee.keyCabinet.utils.CircularQueue;
import com.doumee.keyCabinet.utils.i485.SportUtils;