Merge remote-tracking branch 'origin/master'

tangzy

2021-11-16 3da442cd47a206d0edffb4606d07c305f9d54cd9

 src/views/resource/attachCopy.vue

@@ -112,7 +112,7 @@
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        border: false,
        border: true, //liu
        index: true,
        stripe: true,
        viewBtn: true,