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

zhongrj

2023-06-19 a4e42a8ba7f1e129aacff98d1e1de2f7a4e41804

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/vo/SchedulingRecordVO.java

@@ -5,4 +5,10 @@

@Data
public class SchedulingRecordVO extends SchedulingRecord {
   private String reservoirName;

   /**
    * 上报人
    */
   private String reportUser;
}