diff --git a/ruoyi-admin/src/main/resources/templates/manage/service/service.html b/ruoyi-admin/src/main/resources/templates/manage/service/service.html
index 799ba250..c5f6b103 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/service/service.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/service/service.html
@@ -163,7 +163,11 @@
 
 <script>
     $(function() {
+<<<<<<< HEAD
         //getData()
+=======
+        // getData()
+>>>>>>> bfc73591aee4f41371c35fd522c7c7124d57feb2
     });
 
     function getData() {