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

rk

15 小时以前 3b11f53dfb46957720cb0395a3a549a119da2f05

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

@@ -344,8 +344,8 @@
    }

    public void addInfo(String info){
        String s = infoObs.get();
        /*String s = infoObs.get();
        s=info+"\n"+s;
        infoObs.set(s);
        infoObs.set(s);*/
    }
}