79 Commits (57ea4efb7284ea356ddc0769dc8493104cab6538)

Author SHA1 Message Date
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
4 years ago
ELF 1bec15c186 修改迁移bug 5 years ago
zhengyongxing 2fefd44d0c 公会统计推广员支付时间修正 5 years ago
zhengyongxing cd8f64c7e6 游戏详情订单修改 5 years ago
zhengyongxing 114e51ebe2 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage 5 years ago
zhengyongxing 2220a6cfec 财务支付时间修改,增加手机登录验证,及开发推广员列表名称 5 years ago
ELF f167d63c4a 修改 5 years ago
elf@home fb87be0b43 修改 5 years ago
zhengyongxing 2975b9fe35 市场业绩提成优化 5 years ago
廖金灵 4a755d2269 Merge branch 'feature/market_admin' of wmtx/platform into release
修改换绑bug
5 years ago
ELF ecc228409d 修改 5 years ago
chenzhi bc75da8c14 解决冲突 5 years ago
zhengyongxing 15b9efcd7e 江息网络漏掉的修改 5 years ago
ELF 990a2bd206 解决冲突 5 years ago
ELF e94b6418f1 修改 5 years ago
ELF 8224cfb362 修改 5 years ago
ELF 77c692c44d 修改 5 years ago
zhengyongxing f63b115641 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/add.html
#	Application/Admin/View/PromoteCompany/edit.html
5 years ago
zhengyongxing 2fae4219df 公会统计去除 5 years ago
ELF e3b53e7df1 修改 5 years ago
ELF f9b054e1cb 修改 5 years ago
ELF 6f2f588617 优化 5 years ago
ELF 76fcfec7c2 修改 5 years ago
ELF 5f5a6ee1af 修改 5 years ago
zhengyongxing 4ff957d0f1 将官方渠道修改为江息网络 5 years ago
sunke a4377c017e 支付设置 5 years ago
zhengyongxing 0482836a8e 导出账号权限添加 5 years ago
zhengyongxing 001e9e70f8 管理后台导出权限添加 5 years ago
chenzhi 6f7e0de83d 优化平台币设备,名称 5 years ago
chenzhi f0a19cfc99 优化设备名称为字典 5 years ago
chenzhi cc966711d1 公会统计 游戏名称与设备名称分开 5 years ago
zhengyongxing 87b1b04040 充值财务管理金额保留小数点 5 years ago
chenzhi a33bf22e52 优化弹框 5 years ago
chenzhi a69ef9e118 优化公会统计平台币内充详情不符问题 5 years ago
chenzhi 27d4e7835d 优化公会统计索引1 5 years ago
chenzhi cfbbf8e76b 优化默认公司名称为海南万盟天下科技 5 years ago
chenzhi 650d0c8f69 优化公会统计内外团检索 5 years ago
chenzhi a340a74864 优化公会统计游戏统计的内外团统计 5 years ago
chenzhi 31c7732002 支付渠道统计-操作日志 5 years ago
chenzhi 578948347f 优化公会内外团占比 5 years ago
chenzhi f0d298c042 公会统计新增团体类型 5 years ago
yulingwei e26f517df1 冲突解决 5 years ago
chenzhi a3aa3700a7 修正company_belong模糊问题 5 years ago
chenzhi fa784fac8a 优化游戏订单导出 5 years ago
chenzhi 54f2e0abcd 游戏统计新增会长和公司 5 years ago
chenzhi 1295857697 优化工会统计各级检索条件结束 5 years ago
chenzhi f95d23b091 优化公会统计各级条件展示 5 years ago
chenzhi 9e2eb46904 公会统计游戏统计新增多重搜索 5 years ago
chenzhi 876952f3b4 公会统计新增内外团检索 5 years ago
zhengyongxing 5343ef2162 工会统计新增内外团 5 years ago