Merge branch 'master' into hive2.0

935090232@qq.com

2020-12-03 8703f044482e3a5c1b95daa38630b987abb5b417

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