Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/views/material/product/detail.vue

@@ -774,7 +774,7 @@
     },
     mounted() {
       if (this.clientEnvironmentId == 4) {
-        this.form.measureType = 2;
+        this.form.measureType = 3;
       }
     },
     methods: {