Merge branch 'feature/zl' into 'release'

fix:企业类型bug

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!400

src/views/shop/create-shop.vue

@@ -344,7 +344,6 @@
                   placeholder="请选择企业类型类型"
                   size="small"
                   clearable
-                  :disabled="isDisabled"
                   style="width: 35%"
                 >
                   <el-option