Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0

lawrencehj

2021-07-23 506f60bb0fd433d2d79111a7f4dac57d871b3aed

 web_src/src/components/dialog/platformEdit.vue

@@ -105,9 +105,6 @@
        callback(new Error("请输入设备国标编号"));
      } else {
        var exit = await this.deviceGBIdExit(value);
        console.log(exit);
        console.log(exit == "true");
        console.log(exit === "true");
        if (exit) {
          callback(new Error("设备国标编号已存在"));
        } else {