Merge remote-tracking branch 'origin/api' into api

935090232@qq.com

2021-01-16 79553cb3db14cb9b86fbb0d6aa767b16c786d2fb

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