Merge branch 'developer' into alpha

Helius

2022-03-15 1c04c6a9607b7d4543989c73a1ae91274bbb167c

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