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

guoshilong

2023-11-28 ae37e30dcf71113f69d11fbe7cfef389a1fb9a01

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

@@ -93,8 +93,10 @@
      if (tbAttResSafetyMonitor.getCheckState()==3){
         tbAttResSafetyMonitor.setCheckState(0);
      }

      detail.setCheckState(tbAttResSafetyMonitor.getCheckState());
      // 更新数据
      int i = baseMapper.updateById(tbAttResSafetyMonitor);
      int i = baseMapper.updateById(detail);
      if (i>0){
         if (!edit) {
            tbAttResBaseService.updateFinalState(tbAttResSafetyMonitor.getResGuid(), tbAttResSafetyMonitor.getCheckState());