Merge remote-tracking branch 'origin/master'

SZH

2022-06-29 392b41b8ce3c73cbfaf8235fbd8969709eb066cf

 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