Merge branch 'master' into test

935090232@qq.com

2020-12-05 e945c6e78264a8fdf3cb57f3b33beb2d452516cf

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