-
# Conflicts: # sql/mysql/optional/mall.sql
-
Merge pull request !484 from Rundeepin/feature/mall_product
-
Merge pull request !472 from puhui999/dev
-
2. 商城：增加购物车失效的重选逻辑
# Conflicts: # sql/mysql/optional/mall.sql
Merge pull request !484 from Rundeepin/feature/mall_product
Merge pull request !472 from puhui999/dev
2. 商城：增加购物车失效的重选逻辑