Conflicts: hg-monitor-web-base/src/main/resources/static/vue3/src/api/faultDiagnosisApi.js
…master-v32-lushangqing
