Merge branch 'ty_fix' into score_shop

wzy

2021-11-11 53e83fe43dae6e7f4b7fea91ebe2baa6b871dadd

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