Merge branch 'master' into test

wzy

2020-12-14 0b4861205adec36924244d7dbbcfcf048c620d90

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