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

jyy

2021-05-17 af0fec046a86c63ec007791efdad51ffecf78ae2

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