Merge branch 'ty_fix' into alpha

Helius

2021-11-08 c69abb780e3ccbfdbb8bd180b2fbe0df25f080f6

1
2
3
4
5
update shop_order set shipping_method='1' where shipping_method='物流配送';
update shop_order set shipping_method='2' where shipping_method='立即配送';
 
ALTER TABLE  `shop_order`
MODIFY COLUMN `shipping_method` int(2) NULL DEFAULT NULL AFTER `remarks`;