Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterpris...

liuyg

2021-09-22 f26ce3de26530b7c5399720c4d6449a8ba3309e4

 src/views/securityGuard/securityGuard.vue

@@ -705,7 +705,7 @@
                  ratio: 0.1,
                },
                action: "/api/blade-resource/oss/endpoint/put-file",
                tip: "只能上传jpg/png，且不超过500kb",
                tip: "只能上传jpg/png指纹信息，且不超过500kb",
                span: 10,
                // row: true,
                prop: "fingerprint",
@@ -1041,7 +1041,7 @@
    if (!website.tenantMode) {
      this.initData(website.tenantId);
    }
    console.log(this.search, 111);
    // console.log(this.search, 111);
    this.search["status"] = 1;
  },
  methods: {