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

guoshilong

2024-02-22 9a1fc806b7cd4e4e11778f9d3bf51987f8b7908b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java

@@ -37,7 +37,7 @@

      JSONObject paramJson = new JSONObject();
      paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
      paramJson.put("editPar", "tb_weir_top_elevation");
      paramJson.put("editPar", "tb_weir_top_elevation:修改值为" + attResRsbNorspi.getTbWeirTopElevation());
      paramJson.put("ly", "ywxt");
      paramJson.put("user_id", AuthUtil.getUserId());
      paramJson.put("user_name", AuthUtil.getUserName());