Merge branch 'wjc_new' into develop_new

mac

2024-04-19 788c70114287306db20e9a4539018d6e32fb5cb7

 app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java

@@ -79,6 +79,7 @@
                        public void onSuccess(Boolean obj) {
                            UserConfigManage.getInstance().setBingEmail(mailStr);
                            UserConfigManage.getInstance().Save();
                            setResult(20);
                            finish();
                        }

@@ -189,4 +190,5 @@
        setResult(20);
        super.onBackPressed();
    }

}