Merge branch 'dev' into smqjh_20260107

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBGoodsService.java

@@ -851,7 +851,7 @@ public class HBGoodsService implements IHBGoodsService {
 
         for (ShopSku shopSku : shopCategoryList) {
             FrontCategory frontCategory = frontCategoryMapper.selectOne(new LambdaQueryWrapper<FrontCategory>()
-                    .eq(FrontCategory::getCode, ztFrontCategoryCodeLevel));
+                    .eq(FrontCategory::getCode, ztFrontCategoryCodeLevel).eq(FrontCategory::getIsDelete, 0));
             ShopDetail shopDetail = shopDetailMapper.selectById(shopSku.getShopId());
 
             addShopCategory(frontCategory, spuId, shopSku.getShopId(), shopDetail.getHbStationId());