6695 Commits (master)

Author SHA1 Message Date
elf 910e4c8922 优化 3 years ago
elf 124a2b6b0f 优化 3 years ago
elf 45ad045dc6 有害 3 years ago
elf eeb2e640ac 优化 3 years ago
elf 7e0c26c68f 优化 3 years ago
elf 808e15dcd2 有害 3 years ago
elf b0ef81e0f5 有害 3 years ago
elf 44157634d3 旗云测试资源 3 years ago
elf 8bd6133143 qiyun_testing_resource 3 years ago
ELF 99e7e0f567 优化 3 years ago
ELF 2ac95fa326 优化 3 years ago
ELF a771388c2e 优化 3 years ago
ELF e063398fc5 优化 3 years ago
liaojinling 19286bd33d 优化 4 years ago
liaojinling ee4517adf2 优化 4 years ago
ELF b391774df9 优化 4 years ago
chenzhi 06764fc73f 修改默认配置 4 years ago
chenzhi 562e898d0e 优化官方名称 4 years ago
chenzhi 4ab51a8c64 修改官方渠道名称 4 years ago
chenzhi 578a56ca39 优化默认公司 4 years ago
chenzhi faaf85e080 优化默认公司 4 years ago
chenzhi 5648ce6923 优化默认渠道 4 years ago
ELF 25b58b46b6 优化 4 years ago
chenzhi 30718c7923 优化cdn及菜单 4 years ago
chenzhi 22f5a8ad56 优化首页登陆 4 years ago
chenzhi cef7b9e5fc 优化页面样式 4 years ago
chenzhi ff6d326171 优化菜单修改 4 years ago
ELF 3d32950840 优化 4 years ago
ELF 5a5bd34e5d 优化 4 years ago
ELF e2f74fda25 Merge branch 'master' of 8.136.139.249:wmtx/platform into master_out 4 years ago
zhengyongxing a48f0214c7 归属游戏上传 4 years ago
ELF e57997ee5f Merge branch 'feature/upgrade_pack' into master_out 4 years ago
ELF bb5dcae9ea 优化 4 years ago
ELF 154fa521da Merge branch 'master' of 8.136.139.249:wmtx/platform into master_out 4 years ago
ELF 3529e2b819 Merge branch 'hotfix/game_static_fix' into master_out 4 years ago
ELF 06a7212b20 优化 4 years ago
zhengyongxing 99d281b8e1 财务打款系统bug修复 4 years ago
zhengyongxing c772aa6854 财务打款系统bug修复 4 years ago
zhengyongxing c1c0e3ac14 财务打款系统bug修复 4 years ago
zhengyongxing 0d5ab01f32 财务打款系统bug修复 4 years ago
zhengyongxing 860d389700 财务打款系统bug修复 4 years ago
zhengyongxing f675357a2d 财务打款系统bug修复 4 years ago
zhengyongxing cddf09db60 财务打款系统bug修复 4 years ago
zhengyongxing eda3c9bbe4 财务打款系统bug修复 4 years ago
zhengyongxing 110e5001ee 商务汇总修改 4 years ago
zhengyongxing 859fce06c4 商务奖金功能修改 4 years ago
zhengyongxing 7178181ebb 财务打款系统bug修复 4 years ago
zhengyongxing 01a0d7c717 财务打款系统bug修复 4 years ago
zhengyongxing f474095a24 Merge branches 'feature/add_item' and 'release' of 8.136.139.249:wmtx/platform into feature/add_item_new
 Conflicts:
	Application/Admin/Controller/GameController.class.php
4 years ago
zhengyongxing 619d9d547e 商务奖金功能上传 4 years ago
ELF fe5a24f530 Merge branch 'feature/upgrade_pack' into master_out 4 years ago
ELF 0af353e2da 优化 4 years ago
ELF df58c63c96 优化 4 years ago
ELF c7341d149d 优化 4 years ago
ELF c7b90f54a6 优化 4 years ago
ELF d7d78e748d 修改跨区bug 4 years ago
廖金灵 8323361a9e Merge pull request '强制落地页转换' (#243) from hotfix/force_landing_page into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/243
4 years ago
ELF 15e1fff0ac 优化 4 years ago
ELF 5d92af7dcc 优化 4 years ago
廖金灵 69301ee537 Merge pull request '优化子站上游比例按实际结算' (#240) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/240
4 years ago
chenzhi 6c3aefcf55 优化子站上游比例按实际结算 4 years ago
ELF 560fc4e4ba 优化 4 years ago
tping 9d478c0bc7 1 4 years ago
廖金灵 64a4923564 Merge pull request '财务打款系统bug修复' (#237) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/237
4 years ago
zhengyongxing 2892562b2c 财务打款系统bug修复 4 years ago
chenzhi 96f832322c Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 3b447b70d0 优化公会统计 4 years ago
廖金灵 d6dfae336b Merge pull request '修改九天仙尘落地页名称显示' (#235) from hotfix/special_game_name into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/235
4 years ago
ELF 6bc17ad982 修改九天仙尘落地页名称显示 4 years ago
chenzhi 7ca675b520 优化推广员统计 4 years ago
chenzhi 6c46dd0ea5 优化汇总 4 years ago
chenzhi abb88719b5 新增表同步 4 years ago
ELF a2bd05ceac Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server 4 years ago
廖金灵 a4bbe4fe39 Merge pull request '修复' (#232) from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/232
4 years ago
ELF 7bb9aa833c 优化 4 years ago
liyang a960ed7c0c 修复 4 years ago
ELF e5d4c2e231 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server 4 years ago
廖金灵 1b4fb17d2c Merge pull request 'feature/LY0309' (#231) from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/231
4 years ago
ELF 5bf8961f14 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server 4 years ago
ELF 8dee426c5f 优化 4 years ago
liyang da588a3d86 修复 4 years ago
廖金灵 9973e72bf3 Merge pull request 'feature/add_item' (#229) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/229
4 years ago
郑永星 77532bdb08 Merge pull request 'feature/add_item' (#230) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/230
4 years ago
zhengyongxing 97fae33c43 公会信息功能提交 4 years ago
zhengyongxing f69b0ddf14 公会信息功能提交 4 years ago
liyang 42a8fc94f7 角色查询-本推广号 4 years ago
chenzhi 57abd846c6 新增财务汇总重算 4 years ago
郑永星 841e875e40 Merge pull request '结算单编辑功能负数可编辑' (#228) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/228
4 years ago
zhengyongxing d7f13aad93 结算单编辑功能负数可编辑 4 years ago
廖金灵 7f3f3997fd Merge pull request 'feature/LY0309' (#224) from feature/LY0309 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/224
4 years ago
郑永星 d24d98d11d Merge pull request '市场业绩bug修复' (#227) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/227
4 years ago
zhengyongxing 22b17c5010 市场业绩系统bug修复 4 years ago
zhengyongxing c06b954bf7 市场业绩bug修复 4 years ago
郑永星 5fea16b821 Merge pull request '市场业绩bug修正' (#226) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/226
4 years ago
zhengyongxing 7c60d8321b 市场业绩bug修正 4 years ago
liyang 5cd8ca2857 角色查询、额外额外、测试资源权限修改 4 years ago
liyang a457750390 角色查询、额外额度、测试资源权限修改 4 years ago
廖金灵 2690db95ab Merge pull request 'feature/finance_payment_20210115' (#223) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/223
4 years ago
郑永星 6051f9ee2a Merge pull request '子系统上游修正' (#222) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/222
4 years ago
chenzhi b19d73388b 子站游戏订单bug 4 years ago