sl 173af2594f Merge branch 'dev' of https://guangdagit.com/beike/beikeshop into dev ... # Conflicts: # resources/lang/zh_cn/shop/account.php		2022-08-18 19:17:42 +08:00
..
en	修复订单状态多语言	2022-08-18 17:43:51 +08:00
zh_cn	Merge branch 'dev' of https://guangdagit.com/beike/beikeshop into dev	2022-08-18 19:17:42 +08:00