Merge branch 'developer' into alpha

姜友瑶

2022-05-04 9fc4177dd26683f5dc6d8ebb62ab5b230ac21def

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