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

aix

2024-08-28 f142d48409503dfd6b11d7d414c0ee7ffa85eed5

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java

@@ -31,4 +31,8 @@
   List<SgDeviceGxStepDO> getDeviceGXList(@Param("deviceId") Long deviceId);

    List<SgGxStepDO> queryStepList(@Param("deviceId")String deviceId);

   List<SgGxStepDO> getDEviceGXtwo();

   List<SgGxStepDO> queryStepLists(@Param("deviceType") String deviceType);
}