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

@@ -15,6 +15,7 @@

import java.util.Arrays;
import java.util.Date;
import java.util.List;

/**
 * <p>
@@ -107,4 +108,10 @@
      SgDeviceDO sgDeviceDO = sgDeviceService.getById(id);
      return R.data(sgDeviceDO);
   }

   @GetMapping(value = "/getDeviceList")
   public R queryPageList(@RequestParam(name="programId",required=true) String programId) {
      List<SgDeviceDO> page = sgDeviceService.getDeviceList(programId);
      return R.data(page);
   }
}