合并冲突

5ddce66e · 赵增煜 · 6672e520 · 5ddce66e
Commit 5ddce66e authored Dec 04, 2024 by 赵增煜
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

resources/views/admin/prescription-print.blade.php
+0 -3

No files found.
--- a/resources/views/admin/prescription-print.blade.php
+++ b/resources/views/admin/prescription-print.blade.php
@@ -66,10 +66,7 @@

            $('#is_eseal').on('change', () => this.search());

-<<<<<<< HEAD
-=======

->>>>>>> master
            console.log('事件绑定完成');
            
        }