Merge branch '1.3.1' into dev

wjc

2 天以前 4f12f1e3543fce41e71ae9e21a782f8d9cb41947

 app/src/main/java/com/hdl/photovoltaic/widget/ConfirmationCancelDialog.java

@@ -129,6 +129,7 @@
        }
    }


    public TextView getContentTextView() {
        if (viewBinding == null) {
            return null;