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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DangerReportServiceImpl.java

@@ -101,6 +101,7 @@

      dangerReportSUPO.setReservoirName(encodeReservoirName);
      dangerReport.setReservoirName(attResBase.getName()); // 保存水库名称
      dangerReport.setReservoirId(attResBase.getGuid());

      // 获取用户
      dangerReportSUPO.setCreateUserName(encodeCreateUserName);