Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2025-03-31 80c915239301b1f0e3a732a6318e7743709e9489

 src/views/CNAS/resourceDemand/device/component/failureForm.vue

@@ -170,9 +170,6 @@
    },
    getUserList() {
      selectUserCondition().then(res => {
        if (res.code === 201) {
          return
        }
        this.userList = res.data
      })
    },