Merge remote-tracking branch 'origin/master'

zss

2024-01-11 17f0e644be8c98b547f6994a7e827d328e7b532e

 src/views/basic/location/location-form.vue

@@ -31,14 +31,14 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="父节点类型" prop="pType">
            <el-input
              v-model="dataForm.pType"
              placeholder="父节点类型"
            ></el-input>
          </el-form-item>
        </el-col>
        </el-col> -->
      </el-row>
      <el-row>
        <el-col :span="12">