fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

1
2
ALTER TABLE `sys_shop_info`
    ADD COLUMN `qrcode`  varchar(1000) NULL COMMENT '门店二维码' AFTER `bank_owner_name`;