Merge branch 'ty_fix' into alpha

Helius

2021-11-08 c69abb780e3ccbfdbb8bd180b2fbe0df25f080f6

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