Merge branch 'api' into order_reform

Helius

2021-01-12 b8e2c0dee6ae4520a2e0e783b416825d872c8f9e

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