Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM

haoxuan

2023-11-15 a6649a3319e9f5e9260848872d8cddabfcfc7553

 src/views/other/commonDialog/EditDropdownDialog.vue

@@ -111,7 +111,7 @@
        pageSize: 100
      }).then((res) => {
        console.log(res.data)
        this.tableData = res.data.data.list
        this.tableData = res.data.list
      })
    },
    handleClose() {