6712 Commits (e7c83a28114e1c0cae3a450a569c43d84e28a335)

Author SHA1 Message Date
廖金灵 a9fd28e38f Merge pull request 'feature/add_item' (#294) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/294
4 years ago
zhengyongxing b7d4e9002d 4.23号功能提交 4 years ago
郑永星 d1b570be2a Merge pull request '4.23号功能提交' (#293) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/293
4 years ago
zhengyongxing 83cc2aa6ec 4.23号功能提交 4 years ago
陈志 34fcfc7675 Merge pull request 'hotfix/fiance_statement_bug_20210420' (#292) from hotfix/fiance_statement_bug_20210420 into release
优化关联
4 years ago
chenzhi b257ee8754 优化游戏关联 4 years ago
郑永星 b79f567e0a Merge pull request '4.23号功能提交' (#291) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/291
4 years ago
zhengyongxing 1a2f0ab975 4.23号功能提交 4 years ago
chenzhi fa19156cfb 优化bug 4 years ago
郑永星 49a4caaba6 Merge pull request '4.23号功能提交' (#288) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/288
4 years ago
zhengyongxing 671419882f 4.23号功能提交 4 years ago
chenzhi aa0bcef724 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420 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
chenzhi 7ef7e66a58 优化不弹框提醒 4 years ago
郑永星 cc201dbd41 Merge pull request '4.22号功能提交' (#284) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/284
4 years ago
zhengyongxing f2e56125fe 4.22号功能提交 4 years ago
郑永星 9f5463dd3d Merge pull request '4.22号功能提交' (#283) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/283
4 years ago
zhengyongxing 69566e1839 4.22号功能提交 4 years ago
zhengyongxing d314e6164a 4.22号功能提交 4 years ago
chenzhi 72f69bd079 优化提示 4 years ago
chenzhi 4dd36afd45 优化icon大小限制 4 years ago
chenzhi d5a8c97ad3 优化图片上传 4 years ago
chenzhi 537c496793 优化图片上传 4 years ago
chenzhi b71995aeeb Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420 4 years ago
廖金灵 8375c5f9bd Merge pull request '优化独立减罚' (#280) from hotfix/fiance_statement_bug_20210420 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/280
4 years ago
chenzhi c575d4f590 优化独立减罚 4 years ago
郑永星 b5e8cc4ecb Merge pull request '4.22号功能提交' (#279) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/279
4 years ago
zhengyongxing a5aa8ef744 4.22号功能提交 4 years ago
郑永星 d082a7dc98 Merge pull request '4.22号功能提交' (#277) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/277
4 years ago
zhengyongxing 8fb73e6fed 4.22号功能提交 4 years ago
ELF bfa0c5c5b8 迁移优化 4 years ago
陈志 6d03ea4942 Merge pull request 'feature/finance_payment_20210115' (#276) from feature/finance_payment_20210115 into release
新增退款统计
4 years ago
chenzhi 06202851c2 新增退款统计 4 years ago
chenzhi f349603e7c 新增游戏订单退款 4 years ago
郑永星 80fe58ee20 Merge pull request 'feature/add_item' (#275) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/275
4 years ago
zhengyongxing 9080d521fd 4.22号功能提交 4 years ago
ELF 35e879d084 优化 4 years ago
ELF 9eadb9e0c3 优化 4 years ago
liyang f32d51480f 玩家列表修改 4 years ago
廖金灵 f5566264d9 Merge pull request '特殊补点bug修改' (#272) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/272
4 years ago
zhengyongxing 72077477ed 特殊补点bug修改 4 years ago
chenzhi c0f98f71a5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
zhengyongxing 65e0fda02f 工会统计bug修正 4 years ago
chenzhi 4166112252 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
zhengyongxing a48f0214c7 归属游戏上传 4 years ago
chenzhi 53ae4b0f0e Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 6d92d9e21c 优化菜单操作 4 years ago
chenzhi 17945097ce 优化导出 4 years ago
chenzhi a327627f85 优化行为日志导出 4 years ago
chenzhi bae615bac0 优化子站行为日志 4 years ago
chenzhi 6c9ae2332b 优化管理员添加 4 years ago
chenzhi bea2fa7003 优化管理组子站点功能 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
chenzhi 2ad1ff5434 优化加入组别 4 years ago
chenzhi 7355546a58 优化新增用户组 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
chenzhi 8f7405bb17 优化权限 4 years ago
ELF c7341d149d 优化 4 years ago
ELF c7b90f54a6 优化 4 years ago
ELF d7d78e748d 修改跨区bug 4 years ago
chenzhi 5ea5bb2eaa 优化子站登陆 4 years ago
chenzhi 2a168fb907 优化子站登陆所需函数 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
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