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

rk

4 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/face/ErrActivity.java

@@ -61,6 +61,8 @@
        getVM().getDatas();
    }



    @Override
    protected void doRegister(int type, ActionEventData data) {
        switch (type){