Merge branch 'api' into hive2.0

jyy

2021-03-08 09236e832a65ab4f99e4ca6ecb3ab6022c86ea37

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