Merge branch 'ty_urgent' into api

Helius

2020-12-27 321d1fae7dbd5b399d8df3491ef60a8ea2575451

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