Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

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`;