Merge remote-tracking branch 'origin/master'

liuhaonan

2021-12-24 2de45155f323dd5371e9bb7432bd94b742d5cb77

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java

@@ -6,7 +6,7 @@
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.YSY_MonitorDto;
import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;