Merge remote-tracking branch 'origin/master'

jyy

2020-12-07 65eab9d565f951e3125d6767d0400eb5abcc4d51

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