更新

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1086,11 +1086,6 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow = true
-<<<<<<< .mine
-              console.log("aa")
-=======
-
->>>>>>> .theirs
             }
           }
         }