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/DTO/ProjectSearchDTO.java

@@ -8,11 +8,16 @@
@Data
public class ProjectSearchDTO {
   private String projectName;
   private String deviceName;
   private String skName;
   private String gxType;
   private String gxName;
   private String createUser;
   private Long userId;
   private String gxInfoId;
   private String gxStepNum;
   private String projectId;
   private Integer approvalStatus;
   private Integer status;
   private Long reportPerson;
}