Merge branch 'hive2.0' into score_shop

Helius

2021-04-06 1037ab6df799bd49c0f10adf1c048cd5ccc7e3e8

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