Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tankaikai
2025-03-04 16:36:32 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -58,7 +58,7 @@ public class ShopStorageGoodServiceImpl extends ServiceImpl<ShopStorageGoodMappe
shopStorageGood.setName(product.getName());
shopStorageGood.setImgUrl(product.getCoverImg());
ShopProdUnit unit = shopProdUnitService.getOne(new QueryWrapper().eq(ShopProdUnit::getShopId, shopId).eq(ShopProdUnit::getId, product.getId()));
ShopProdUnit unit = shopProdUnitService.getOne(new QueryWrapper().eq(ShopProdUnit::getShopId, shopId).eq(ShopProdUnit::getId, product.getUnitId()));
shopStorageGood.setUnit(unit == null ? "" : unit.getName());
}
shopStorageGood.setShopId(shopId);