Merge remote-tracking branch 'origin/master'

feige

2024-11-20 b10f260189e5db5b89d9a85ce4fb08984d2aae2a

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java

@@ -597,7 +597,7 @@
            }

            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(data.getId(),2017L);
            if (!memoBookService.removeByIds(memoBookService1))
            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
                return AjaxResult.error();
        }