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

rk

2 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

 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);*/
    }
}