Commit Graph

7560 Commits (e278c9de7688338c7ef792491d8f5de8c3d1a810)
 

Author SHA1 Message Date
chenzhi 986065ab4b 优化名词
tping 033cd00aee 1126
zhengyongxing c749df4936 11月功能提交
tping d8924dc8be 1126 客服qq
zhengyongxing 36d40bc24e 11月功能提交
zhengyongxing 5add29fa6b 11月功能提交
zhengyongxing 8bce1bd12c Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing 2040991894 11月功能提交
万盟天下 4f185eeb8a Merge branch 'feature/promote_tg_dm' of wmtx/platform into release
优化当前域名获取
ELF a0f57749c4 优化当前域名获取
万盟天下 e81ccd7d34 Merge branch 'feature/promote_tg_dm' of wmtx/platform into release
添加域名前缀限制
ELF ef8334dd18 添加域名前缀限制
chenzhi e7501be7c3 优化审核流程
万盟天下 b698b82409 Merge branch 'feature/promote_tg_dm' of wmtx/platform into release
根据推广公司配置推广后台
tping ff4975bacb 1126
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
zhengyongxing a6263b2205 11月功能提交
张谷诚 ccd5b487a9 Merge branch 'hotfix/pay_notice1123' of wmtx/platform into master
支付通知 补单
tping 3471639489 支付通知 补单
张谷诚 0da46347ac Merge branch 'hotfix/pay_notice1123' of wmtx/platform into master
支付回调小数点后面.00处理
tping 103acdd15d 支付通知 小数点后面.00
chenzhi 5bdc0e6f6e 优化汇总方案
tping 0d52dc7d61 1126
chenzhi 55dd67e34d 优化撤回
chenzhi 56681580dd 合并
chenzhi 6d4fce53eb 优化线下打款
chenzhi bd125be3dd 优化汇总审核流程
ELF c339623c78 优化
elf@home dd66846e68 根据推广公司配置推广后台
zhengyongxing 1626640066 11月功能提交
万盟天下 d7eb2b75a2 Merge branch 'release' of wmtx/platform into master
优化游戏汇总
ELF 773068b57c 优化代码
zhengyongxing 4eff2f0aaa 11月功能提交
zhengyongxing d6b1916a5d 11月功能提交
ELF dd7068e3ae 改用redis存储session
tping 025d90f5fa 1126
陈志 08068c6349 Merge branch 'fix/company_20201111' of wmtx/platform into release
优化游戏汇总
chenzhi ad1d4e65a5 优化游戏汇总
chenzhi bea27fd5de 优化游戏汇总
tping c75d73c9f7 1126
ELF 6a50654045 游戏统计/后台登录时间修改
chenzhi 7f9bb248dd 优化推广员统计
chenzhi 1f694ef47b 优化推广员充值
chenzhi e896f5e649 Merge branch 'master' of 47.111.118.107:wmtx/platform into fix/company_20201111
chenzhi a6f9d82245 优化推广员累计注册
chenzhi 7a876e01ab 优化新增推广员汇总
zhengyongxing f49cd75e86 11月功能提交
zhengyongxing 6811eb806c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
	Application/Admin/Controller/CompanyStatementSetController.class.php
	Data/update.sql
廖金灵 da2dc09690 Merge branch 'new_change' of wmtx/platform into master
汇总bug修改
zhengyongxing e098384635 汇总bug修改