From 392b41b8ce3c73cbfaf8235fbd8969709eb066cf Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: Wed, 29 Jun 2022 14:50:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
index 63fe037..0c2014f 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/DemoServiceImpl.java
@@ -1,6 +1,7 @@
 package com.gkhy.safePlatform.emergency.service.impl;
 
 import com.gkhy.safePlatform.emergency.service.DemoService;
+import com.gkhy.safePlatform.emergency.service.baseService.DemoInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -8,7 +9,7 @@
 public class DemoServiceImpl implements DemoService {
 
     @Autowired
-    private DemoService demoService;
+    private DemoInfoService demoInfoService;
     // 1
 
     //2

--
Gitblit v1.9.2