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

rk

昨天 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

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

@@ -23,7 +23,7 @@
    }

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