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

xieb

2023-07-12 8aa4448ea65b5ef86689bd15c6b895afc99d17d0

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/dto/PatrolGroupDTO.java

@@ -11,5 +11,5 @@
@Data
public class PatrolGroupDTO extends PatrolGroup {

   private List<PatrolReportVO> patrolReportList;
   private List<PatrolRecordVO> patrolRecordVOList;
}