Merge branch 'api' into order_reform

Helius

2021-01-11 854d9d55a86b7076abc4f526e90001bd806d324c

1
2
3
ALTER TABLE `shopping_goods`
ADD COLUMN `is_del` int(2) NULL COMMENT '是否删除1否，2已删除' AFTER `headquarters`;
update shopping_goods set is_del=1