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

zss

2025-03-04 b64d6db597d332c699f84e4928f6d3e5551851f1

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

@@ -350,14 +350,7 @@
    },
    getUserList() {
      selectUserCondition().then(res => {
        let data = [];
        res.data.forEach((a) => {
          data.push({
            label: a.name,
            value: a.id,
          });
        });
        this.userList = data
        this.userList = res.data
      })
    },
  },