Merge branch 'groupType' into test

src/components/icss/PubIndeptTag.vue

@@ -167,7 +167,6 @@
             <el-form-item
                     label="标签前后缀："
                     class="fix-inp"
-                    prop="region12"
                     v-if="form.region2==5 ||form.region2==6 || form.region2==7 || form.region2==8"
             >
                 <el-col :span="10">