Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product

# Conflicts:
#	sql/mysql/mall.sql
This commit is contained in:
owen
2023-10-17 23:29:11 +08:00
24 changed files with 811 additions and 84 deletions

View File

@ -1,5 +1,2 @@
INSERT INTO system_menu (name, permission, type, sort, parent_id, path, icon, component, component_name)
VALUES ('商城首页', '', 2, 1, 2362, 'home', 'ep:home-filled', 'mall/home/index', 'MallHome');
INSERT INTO system_menu (name, permission, type, sort, parent_id, path, icon, component, component_name)
VALUES ('核销订单', '', 2, 2, 2166, 'pick-up-order', 'ep:list', 'mall/trade/delivery/pickUpOrder/index', 'PickUpOrder');