合并冲突

spring

2025-02-26 d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289

 src/components/view/b1-sample.vue

@@ -443,6 +443,7 @@
    watch:{
      storageVisible(newVal){
        if(newVal){
            this.selectList()
            this.sampleCode = null
            this.entrustCode = null
            // this.$message.success('扫码：打开')