Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2020-12-09 95cdd1c5f86bf7ec5af17a07d819976a0365b5d7

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