Merge branch 'api' into order_reform

wzy

2021-01-13 1a6bfc97c0acfbb386f4e06f6d0a4558c305d994

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