Merge branch 'dev-fix-20210715' into 'release'

回显医生，code review:bo.dang

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!30

src/components/common/diagnosis-doctor.vue

@@ -225,7 +225,7 @@ export default {
       })
     },
     cancel(){
-      this.formData.receptionId = "";
+      this.doctorId = "";
       this.formData.outsideDoctor = '';
       this.$emit('update:diagnosisDoctorVisible', false);
     },