Merge branch 'developer' into alpha

Helius

2022-03-14 938d37e96dc00f8fc3c7036d818e87d51624e0a9

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