Merge remote-tracking branch 'origin/master'

src/views/modules/part/partProductGroupInformation.vue

@@ -377,7 +377,7 @@
                 <el-input v-model="scope.row.textValue" v-else></el-input>
               </div>
               <div v-else>
-                <el-select style="width: 100%;" v-if="scope.row.valueTypeDb === 'text'" v-model="scope.row.textValue">
+                <el-select style="width: 100%;" v-if="scope.row.valueType === 'text'" v-model="scope.row.textValue">
                   <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
                 </el-select>
                 <el-select style="width: 100%;" v-else v-model="scope.row.numValue">