Merge branch 'ty_fix' into alpha

Helius

2021-11-09 51c026156e7e0cd75805ef7b61f6dc6eeab7afb6

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