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

doum

3 天以前 0f56aa60f9d6a779790f5f490cc8d3f3a39cf4aa

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