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

LSH

2023-09-26 bbfb525c87ab208f123f8f5a4c7c6a87df4a3a23

 src/main/java/com/zy/asrs/controller/WaitPakinController.java

@@ -96,8 +96,10 @@
            WrkMast wrkMast = wrkMastService.selectByBarcode(entity.getBarcode());
            if (Cools.isEmpty(wrkMast)) {
                waitPakinService.delete(new EntityWrapper<>(entity));
            } else {
                return R.error("工作档数据已存在,无法删除！！");
            }
            return R.error("工作档数据已存在,无法删除！！");

        }
        return R.ok();
    }