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

aix

2024-08-28 f142d48409503dfd6b11d7d414c0ee7ffa85eed5

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

@@ -13,4 +13,5 @@
private String    stepNum;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date reportTime;
private Integer resubmit;
}