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

doum

2 天以前 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

 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){