Merge branch 'master' into test

935090232@qq.com

2020-12-05 0a5277a24bce41ca6900d4176cbe30cde55d2be6

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