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

jyy

2021-01-16 3a92361f2181c5d6fcd16536f3a9a80c89d193d6

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