冲突提交

dev_chengFeng
jiaoyangna 2020-12-24 16:49:53 +08:00
parent a6a596746d
commit cb5e374ebf
1 changed files with 0 additions and 3 deletions

View File

@ -50,11 +50,8 @@ local _ShowPlusType = {
UpViewRechargeType.YHMF,
UpViewRechargeType.QuLingBi,
UpViewRechargeType.DingKunShenChu,
<<<<<<< HEAD
=======
UpViewRechargeType.YeQiuQuan,
UpViewRechargeType.HuaLingFu,
>>>>>>> bc582d93e...
}
-- 判断是否显示加号