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

weimingfei

8 天以前 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a

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