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

zhuo

2025-03-17 f05b9e79dbbcc423087e3b6930880dc25945118c

 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
      })
    },