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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

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

@@ -6,4 +6,14 @@
@Data
public class SchedulingRecordVO extends SchedulingRecord {
   private String reservoirName;

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

   /**
    * 行政区划
    */
   private String adCode;
}