Merge branch 'ty_fix' into alpha

Helius

2021-11-11 404c2fea96204bc0fc4a6845cb13d1992d728aa4

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