Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/deviceCalendar/DeviceCalendarListModel.vue

@@ -212,13 +212,13 @@
        this.loadData();
      },
      openPage() {
        this.visible = true
        this.onClearSelected()
        this.valueProduct=null
        this.visible = true
        this.dataSource = [];
        this.queryParam = {
          status: this.status
        };

        this.loadData();
        this.initOptions();
        this.initGroupOptions()