Merge branch 'ww' into test

2024-10-10 16:04:43 +08:00
parent 349ddf38a2 4b28ad0f1c
commit 58ef3ae818
2 changed files with 19 additions and 3 deletions
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
@@ -273,7 +273,7 @@ public class TbProductServiceImpl implements TbProductService {
                    }
                }
            }
-            productNewVo.setConInfos(CollectionUtils.isEmpty(skuCons)?Arrays.asList():skuCons);
+            productNewVo.setConInfos(CollectionUtils.isEmpty(skuCons)? Collections.emptyList() :skuCons);
            products.add(productNewVo);
        }
        Map<String, Object> result = PageUtil.toPage(products, page.getTotalElements());