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

zhuo

2025-04-17 06ca842a5219511302497d0a87be4293ae7cb7a0

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

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