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

rk

8 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 keyCabinet-android/lib_coremodel/src/main/java/com/doumee/lib_coremodel/base/BaseViewModel.java

@@ -228,6 +228,10 @@
        actionEvent.setValue(new ActionEventData(type));
    }

    public void doAction(int type,String obj){
        actionEvent.setValue(new ActionEventData(type,obj));
    }

    public LifecycleOwner getLifecycleOwner() {
        return lifecycleOwner;
    }