Merge branch 'ty_fix' into alpha

Helius

2021-11-12 b70d988c7600d179aba0fabb6adf0dc7c461cb8a

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