Merge branch 'api' into hive2.0

jyy

2021-03-08 aaaf4564b44adf5b9a47843b27fbd68ea56c9a52

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