Merge remote-tracking branch 'origin/jtdev' into jtdev

shenyijian

2024-06-14 c0d555bcd9ff0e8fa35e5a8636bc4c05743dc1e9

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgDeviceController.java

@@ -1,12 +1,8 @@
package cn.gistack.sm.sg.controller;

import cn.gistack.sm.patrol.entity.PatrolInfo;
import cn.gistack.sm.sg.DO.SgDeviceDO;
import cn.gistack.sm.sg.DO.SgProjectInfoDO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import cn.gistack.sm.sg.DTO.SgDeviceSearchDTO;
import cn.gistack.sm.sg.service.SgDeviceService;
import cn.gistack.sm.sg.service.SgProjectInfoService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import org.springblade.core.boot.ctrl.BladeController;
@@ -14,7 +10,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;