冲突合并

44d00708 · dmx_mac · d7e7b356 · 96322f28 · 44d00708
--- a/src/views/IM/diagnosis-admin/diagnosis-list-new.vue
+++ b/src/views/IM/diagnosis-admin/diagnosis-list-new.vue
@@ -695,6 +695,10 @@
        allTilst: [],
        allList: {},
        consultationTypeList: [
+          {
+            label: '全部',
+            value: '',
+          },
          {
            label: '名医问诊',
            value: 2,