fix conflict

Helius

2020-12-11 37b2fa02d4e9540b67f9ec02740d7720ec38df3a

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