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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

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

@@ -220,10 +220,8 @@
         if (newTbAttResWaterDelivery.getCheckState()==4){
            fillName = "编辑";
            // 找到相关的 guid 数据
            for (TbAttResWaterDelivery tbAttResWaterDelivery : oldList) {
               if (tbAttResWaterDelivery.getGuid().equals(newTbAttResWaterDelivery.getGuid())){
                  newTbAttResWaterDelivery.setCheckState(tbAttResWaterDelivery.getCheckState());
               }
            if (oldList.size()>0) {
               newTbAttResWaterDelivery.setCheckState(oldList.get(0).getCheckState());
            }
         }