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

shenyijian

2024-06-24 7d44d7a2a9ee8f55e911d678d78ff25f047cab4d

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProjectInfoVO.java

@@ -16,9 +16,14 @@
   private String gxName;
   private String deviceName;
   private Long dId;
   private Long reportId;
   private Long stepId;
   private String gxStepName;
   private Integer STATUS;
   private Integer reportStatus;
   private String gxStepNum;
   private String deviceType;
   private String typeName;
   private Integer deviceStatus;
   private Integer projectStatus;
   private String progressName;
}