Merge branch 'ty_urgent' into test

wzy

2020-12-20 53c616910a3fd6f2f9669242690c1c85f2ba0a68

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