505 Commits (37091aef5848330a2845ad9b240e656cdab16831)

Author SHA1 Message Date
廖金灵 d4c02f76ac Merge pull request 'feature/discount_voucher' (#474) from feature/discount_voucher into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/474
3 years ago
ELF cb06ecc2f2 优化 3 years ago
ELF 844ffdcabd 添加日志 3 years ago
ELF 10d3156c8e 游戏折扣 3 years ago
ELF 85abe60b7e 有害 3 years ago
ELF d7f9191bb8 有害 3 years ago
ELF 60799d7ef5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/shift_player_update 3 years ago
廖金灵 39d40b59e2 Merge pull request '优化' (#451) from feature/game_rebate1 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/451
3 years ago
ELF d3e4c40d44 优化 3 years ago
廖金灵 a874de5fe6 Merge pull request 'feature/game_rebate1' (#450) from feature/game_rebate1 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/450
3 years ago
ELF 82bc905b45 返利优化 3 years ago
ELF ba3d1dadd2 优化 3 years ago
ELF 9eb2a53b24 优化 3 years ago
ELF 0a3027796f 返利添加游戏 3 years ago
chenzhi bc19bec4b1 优化发放 3 years ago
廖金灵 813a05a04c Merge pull request 'feature/more_payment' (#430) from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/430
3 years ago
ELF f2d5faf211 封禁链接 3 years ago
ELF 55a14f9d46 优化玩家迁移 3 years ago
chenzhi 3d215d57aa 优化会长添加或者换绑引起的市场变化 3 years ago
chenzhi aae58f024b 优化添加会长 3 years ago
ELF 69922e73a1 有害 3 years ago
ELF 0d08c9c5fc 优化 3 years ago
ELF 0ea585bd96 游戏返利 3 years ago
廖金灵 84a6b21f88 Merge pull request '优化' (#390) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/390
3 years ago
ELF 9fb91c4a66 优化 3 years ago
廖金灵 742bb493c1 Merge pull request 'hotfix/remove_promote_package' (#387) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/387
3 years ago
ELF 4e1cf805ea 优化 3 years ago
ELF 98c938c814 优化 3 years ago
ELF 78a24c78f5 优化 3 years ago
廖金灵 175cfbf71c Merge pull request 'hotfix/remove_promote_package' (#372) from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/372
4 years ago
ELF 9f37c6db3c 有害 4 years ago
ELF 23feb76e09 有害 4 years ago
ELF b9092a4501 有害 4 years ago
chenzhi c36ce00b60 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment 4 years ago
chenzhi c4849ffc7c 新增商户固定 4 years ago
ELF 80e02733e7 封禁推广员推广链接 4 years ago
廖金灵 95da7866d1 Merge pull request 'feature/op_player_shift' (#332) from feature/op_player_shift into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/332
4 years ago
ELF 90d82b1a8d 有害 4 years ago
ELF 8440c5d384 优化 4 years ago
ELF a9ec0f0116 优化 4 years ago
ELF fea86b964c 优化 4 years ago
ELF 11b9ec62ba 优化 4 years ago
ELF 0888779250 优化 4 years ago
廖金灵 56e28d216e Merge pull request '版本更新' (#285) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/285
4 years ago
ELF bfa0c5c5b8 迁移优化 4 years ago
zhengyongxing 9080d521fd 4.22号功能提交 4 years ago
ELF c7341d149d 优化 4 years ago
ELF c7b90f54a6 优化 4 years ago
ELF d7d78e748d 修改跨区bug 4 years ago
ELF 7bb9aa833c 优化 4 years ago
ELF 8dee426c5f 优化 4 years ago
郑永星 f078bfd8b6 Merge pull request '2.10号功能提交' (#171) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/171
4 years ago
zhengyongxing 4419f1539c 2.10号功能提交 4 years ago
郑永星 3c760984ab Merge pull request '2.10号功能提交' (#170) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/170
4 years ago
zhengyongxing 9b2f7b1a61 2.10号功能提交 4 years ago
廖金灵 e84f8c174a Merge pull request '优化' (#165) from feature/testing_quota_up into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/165
4 years ago
ELF 8a815af691 优化 4 years ago
ly 4a69622b01 额外额度备注信息显示 4 years ago
陈志 9b3b982df7 Merge pull request '优化所属会长判断' (#154) from feature/testing_daily_count into release
优化所属会长判断
4 years ago
chenzhi d7a787c0fc 优化所属会长判断 4 years ago
郑永星 12eb8aa9f0 Merge pull request '2.7号功能提交' (#153) from feature/add_item into release
2.7号功能提交
4 years ago
zhengyongxing 53ba2c7698 2.7号功能提交 4 years ago
chenzhi 290b48dc3b 优化测试统计导出 4 years ago
ELF a355c2b579 优化 4 years ago
elf@home 23643d2e0b 修改 4 years ago
廖金灵 ea21c1ee49 Merge pull request '修改i哎' (#133) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/133
4 years ago
ELF 874ba3a705 修改i哎 4 years ago
廖金灵 9af9edef0a Merge pull request '优化' (#129) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/129
4 years ago
ELF a3d3b5722c 优化 4 years ago
郑永星 3d09dcf4b5 Merge pull request '1.28功能提交' (#127) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/127
4 years ago
zhengyongxing 338c0369d1 1.28功能提交 4 years ago
廖金灵 dcbc152712 Merge pull request '优化' (#125) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/125
4 years ago
ELF 4f3c21263d 优化 4 years ago
廖金灵 7194d5a945 Merge pull request '优化' (#112) from feature/add_promote_level_id into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/112
4 years ago
ELF 0aa3c514d7 优化 4 years ago
陈志 0b55550a62 Merge pull request 'feature/testing_daily_count' (#107) from feature/testing_daily_count into release
优化首页提醒
4 years ago
chenzhi 13d0c6fa59 优化首页提醒 4 years ago
ELF 9e68e40200 解决冲突 4 years ago
chenzhi 2658c50c3a 新增测试资源统计 4 years ago
ELF 531b94bae8 版本 4 years ago
elf@home 34e25f293a 推广员添加每级id 4 years ago
郑永星 6c1c82b649 Merge pull request '1.28功能提交' (#100) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/100
4 years ago
zhengyongxing deff984922 1.28功能提交 4 years ago
ELF d08df7feba 修改 4 years ago
ELF 07c95d2ea7 剑破长空测试资源 4 years ago
zhengyongxing c9ef39ada9 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing d3e9f113ba 市场业绩离职功能提交导出修正 4 years ago
zhengyongxing 6e767a739c 市场业绩功能提交 4 years ago
ELF 3dfc92ecc3 修改下载超时 4 years ago
ELF a70bffaee3 修改bug 4 years ago
ELF 4f4929ad72 修改 4 years ago
ELF 932a082134 剑仙诀添加资源发放接口 4 years ago
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
4 years ago
tping cf88d4c1db Merge branch 'release' into feature/1211
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
4 years ago
ELF f2be33c427 修改 4 years ago
tping 31ce7b071c 1211 4 years ago
ELF 1b74318619 修改 4 years ago
ELF c8f082cee8 优化显示 4 years ago
ELF 78caa452b2 测试资源添加审核人 4 years ago
ELF 88402dfac0 修改 4 years ago
ELF 1bb1b284e6 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check 4 years ago
ELF f95125892a 优化推广员后台汇总查询 4 years ago
ELF 7468057834 推广员结算订单归属 4 years ago
ELF a0f57749c4 优化当前域名获取 4 years ago
ELF c339623c78 优化 4 years ago
elf@home dd66846e68 根据推广公司配置推广后台 4 years ago
ELF 89332c0d54 解决冲突 4 years ago
ELF c550846454 修改 4 years ago
ELF 977cfcba3c 修改 4 years ago
ELF c20d071817 修改 4 years ago
ELF 40123f8c50 修改 4 years ago
ELF 530dded4e7 优化 4 years ago
ELF ceadb8562f 新增60/90日留存率统计 4 years ago
ELF 5253a76963 优化 4 years ago
ELF 3a6b912399 优化 4 years ago
ELF afc95791d2 优化 4 years ago
ELF 1f3eaa06da 修改 4 years ago
ELF 07f7bca3ee 修改 4 years ago
ELF 47ca2f2b9e 修改 4 years ago
ELF e1352fea1e 修改 4 years ago
ELF dd71ccdf83 修改 4 years ago
ELF f490f10ee5 Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/testing_resource_admin 4 years ago
ELF 34586b228e 修改 4 years ago
ELF 8c8d01a446 修改评级 4 years ago
ELF 3a4fb51222 修改支付商户规则bug 4 years ago
ELF 65c5a221fc 修改 4 years ago
ELF b44a5118cf 修改 4 years ago
ELF 36c240c608 修改 4 years ago
ELF a10bb888da 修改bug 4 years ago
ELF c5fe80639f 修改 4 years ago
ELF 06bd640c79 修改 4 years ago
ELF 263e35c097 初步提交 4 years ago
ELF 2ae89b9edb 解决冲突 4 years ago
ELF 9b11202deb 修改 4 years ago
elf@home c4eb04428e 修改 4 years ago
ELF afad195062 修改 4 years ago
ELF ca99068a0e 修改 4 years ago
ELF 19c782b053 解决冲突 4 years ago
ELF 268ea4e34d 修改 4 years ago
zhengyongxing dab8251c11 Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
 Conflicts:
	Application/Admin/Controller/AggregateFinanceStatementController.class.php
	Data/update.sql
4 years ago
ELF 6fcaa1362c 重置权限缓存 4 years ago
ELF 6da122550c 优化 4 years ago
zhengyongxing f95b593455 Merge remote-tracking branch 'origin/feature/company_export_change' into feature/company_export_change
# Conflicts:
#	Application/Base/Tool/AggregateClient.class.php
#	Data/update.sql
4 years ago
zhengyongxing 3c698adba9 上游导出修正 4 years ago
ELF 16122d5d9f 修改 4 years ago
chenzhi f169d65c1c 优化推广公司添加排序 4 years ago
ELF 050eb98843 xiugai 4 years ago
ELF 2c9092273f 修改 4 years ago
elf@home 1dd594f46f 修改bug 4 years ago
廖金灵 6a78824b10 Merge branch 'feature/promote_company_merge' of wmtx/platform into release
修改
4 years ago