完成合并并解决冲突

xuxueyang

2024-09-14 92a4759e242421f578d463e457fcea33893c6c2a

1
2
3
4
5
6
{
    "uni-goods-nav.options.shop": "shop",
    "uni-goods-nav.options.cart": "cart",
    "uni-goods-nav.buttonGroup.addToCart": "add to cart",
    "uni-goods-nav.buttonGroup.buyNow": "buy now"
}