Merge branch 'feature/jq' into 'develop'

Feature/jq

See merge request !172

1

+Merge branch 'develop' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into feature/jq
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.

src/views/IM/diagnosis-admin/modal/newScheduling.vue

@@ -136,7 +136,7 @@
           defaultDate: new Date(),
           datesSet: this.handleDatesSet,
           events: [],
-          slotEventOverlap: false,
+          slotEventOverlap: true,
           header: {
             center: 'month,agendaFourDay', // buttons for switching between views
           },