Merge branch 'wjc_new' into develop_new

mac

2024-05-30 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f

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

@@ -73,7 +73,7 @@
    }

    private void initEvent() {
        viewBinding.toolbarTopExceptionRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
        viewBinding.toolbarTopExceptionRl.topBackLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                dismiss();