冲突合并

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -695,6 +695,10 @@
         allTilst: [],
         allList: {},
         consultationTypeList: [
+          {
+            label: '全部',
+            value: '',
+          },
           {
             label: '名医问诊',
             value: 2,