1

src/pages/main/Print.vue

@@ -997,8 +997,6 @@
                              alt="" srcset="" v-else>
 
 
-<<<<<<< .mine
-                    <!--<span v-if="setAdminUserES(advices[0][0].advice_doctor) == ''">{{getAdminUser(advices[0][0].advice_doctor)}}</span>-->
                     <!--<img class="es-img" :src="setAdminUserES(advices[0][0].advice_doctor)"-->
                     <!--alt="" srcset="" v-else>-->
 =======