6785 Commits (80e02733e7dda3991718bffb69bf385c7ff9d242)

Author SHA1 Message Date
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
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
zhengyongxing 68c873983b 子系统上游修正 4 years ago
chenzhi ce90ddf3ad 优化推广员统计 4 years ago
廖金灵 8e571e0808 Merge pull request 'feature/finance_payment_20210115' (#219) from feature/finance_payment_20210115 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/219
4 years ago
chenzhi c91206c176 优化推广员统计 4 years ago
chenzhi 7c460cdb47 优化支付导出 4 years ago
陈志 b4277c2276 Merge pull request '优化订单换绑到江息' (#217) from feature/finance_payment_20210115 into release
优化订单换绑到江息
4 years ago
chenzhi c2303a0676 优化订单换绑到江息 4 years ago
郑永星 c754037b79 Merge pull request '财务子系统bug修改' (#216) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/216
4 years ago
zhengyongxing 2f9a822583 财务子系统bug修改 4 years ago
chenzhi 4f14228bab 优化子站列表 4 years ago
chenzhi a03993f251 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
liyang 8617ad3e91 Merge branch 'release' of http://8.136.139.249:3000/wmtx/platform into feature/LY0309 4 years ago
chenzhi 1b7dae2603 优化结算同步 4 years ago
chenzhi c21b9f619e 新增子站结算 4 years ago
zhengyongxing 0332b591e8 3.22功能提交 4 years ago
chenzhi 8d871290f2 优化默认公司 4 years ago
zhengyongxing eb8c9cebc1 3.22好功能提交 4 years ago
chenzhi 50363297e8 优化订单数据换绑 4 years ago
chenzhi f670c7196a 优化提示 4 years ago
chenzhi 6790ab5fd3 新增订单重算及固化 4 years ago
chenzhi 1de381bccd 优化是否结算 4 years ago
chenzhi bb10181cc5 新增子站游戏订单及导出 4 years ago
chenzhi 8b98460242 新增备注 4 years ago
chenzhi 17cee767b7 子站同步脚本 4 years ago
liyang f8b93616ce 菜单封装中 4 years ago
chenzhi 59d1e31119 优化退款可以负数 4 years ago
chenzhi 7ed2855dc5 优化重算 4 years ago
chenzhi e7a51c41da 优化前端入口文件 4 years ago
chenzhi 5f3c726a05 优化游戏统计合计 4 years ago
chenzhi 243dce02ca 优化聚合万盟数据 4 years ago
chenzhi aa99f1f668 新增审核撤回 4 years ago
chenzhi 88d02f7be1 优化导出提醒-zyx 4 years ago
廖金灵 a429003fa9 Merge pull request '财务子系统bug修复' (#198) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/198
4 years ago
zhengyongxing 3900a4081a 财务子系统bug修复 4 years ago
zhengyongxing ae3ad391fd 新功能开发 4 years ago
廖金灵 96c6a47dd5 Merge pull request '热更修复' (#197) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/197
4 years ago
zhengyongxing a84a69fd56 热更修复 4 years ago
郑永星 3eb6fbad4d Merge pull request 'feature/add_item' (#196) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/196
4 years ago
ELF 1ab1db12ab 修复苹果落地页无法滚动bug 4 years ago
廖金灵 e9507ddb95 Merge pull request '热更修复汇总上游时间错误' (#194) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/194
4 years ago
zhengyongxing 55c75e159c 热更修复 4 years ago
廖金灵 df747704ba Merge pull request '2.28号功能提交' (#193) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/193
4 years ago
zhengyongxing 55ffc36a10 2.28号功能提交 4 years ago
廖金灵 bd20d4a770 Merge pull request '2.28号功能提交' (#192) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/192
4 years ago
zhengyongxing 4aa569d092 2.28号功能提交 4 years ago
陈志 f328397807 Merge pull request 'feature/finance_payment_20210115' (#190) from feature/finance_payment_20210115 into release
优化连接
4 years ago
chenzhi 75850db849 优化测试 4 years ago
chenzhi 0a0ee66012 优化连接 4 years ago
chenzhi cc59050261 优化权限添加 4 years ago
陈志 a26b10ab2c Merge pull request 'feature/finance_payment_20210115' (#188) from feature/finance_payment_20210115 into release
优化上游
4 years ago
chenzhi a33ea0d575 优化上游 4 years ago
chenzhi e8dea24f46 新增周结 4 years ago
陈志 a85ae5125c Merge pull request '优化子站平台币充值区分万盟' (#187) from feature/finance_payment_20210115 into release
优化子站平台币充值区分万盟
4 years ago
chenzhi 55572ce862 优化子站平台币充值区分万盟 4 years ago
郑永星 0c465ef26d Merge pull request '2.28号功能提交' (#186) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/186
4 years ago
zhengyongxing 886bbfcfc2 2.28号功能提交 4 years ago
郑永星 1b86292c4e Merge pull request '2.28号功能提交' (#185) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/185
4 years ago
zhengyongxing 73beadd929 2.28号功能提交 4 years ago
郑永星 d73e2bae02 Merge pull request '2.28号功能提交' (#184) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/184
4 years ago
zhengyongxing bc3f4f02d3 2.28号功能提交 4 years ago
郑永星 727873e25c Merge pull request 'feature/add_item' (#183) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/183
4 years ago
zhengyongxing 1ec35eeb32 2.28号功能提交 4 years ago
chenzhi 7756efe859 优化结算单显示 4 years ago
zhengyongxing 2af6231106 2.28号功能提交 4 years ago
zhengyongxing 5556bbf171 2.28号功能提交 4 years ago
zhengyongxing 9837ba3682 2.28号功能提交 4 years ago
zhengyongxing 0be51f4d62 2.28号功能提交 4 years ago
郑永星 0f39caaf60 Merge pull request 'feature/add_item' (#177) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/177
4 years ago
zhengyongxing c6587b61a5 2.28号功能提交 4 years ago
zhengyongxing 8e28b1c4ad 2.28号功能提交 4 years ago
郑永星 dfdcedea38 Merge pull request '2.28号功能提交' (#176) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/176
4 years ago
chenzhi 12f84844c4 新增权限审核 4 years ago
zhengyongxing 016c2e11bd 2.28号功能提交 4 years ago
chenzhi a889417f5a Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 4 years ago
chenzhi 0b4e9fa9a1 优化重算 4 years ago
郑永星 23147ac0cc Merge pull request '2.28号功能提交' (#173) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/173
4 years ago
zhengyongxing 4425750972 2.28号功能提交 4 years ago
chenzhi 3263c108c3 新增个人结算 4 years ago
chenzhi c285a88c8d 优化子站生成数据 4 years ago
chenzhi 7d650a9595 子站内团脚本 4 years ago
chenzhi a439946207 优化子站启动脚本 4 years ago
chenzhi 4024e45c64 优化子站上游结算 4 years ago
chenzhi e6e8e1d0b3 暂存 4 years ago
chenzhi b75bcdbb1c 新增上游导出查看 4 years ago
郑永星 b7a120c56a Merge pull request '2.10号功能提交' (#172) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/172
4 years ago
zhengyongxing c2bfcd39b6 2.10号功能提交 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
陈志 6d60674031 Merge pull request '优化永星bug' (#168) from feature/finance_payment_20210115 into release
优化永星bug
4 years ago
chenzhi 098ba97d3e 优化永星bug 4 years ago
廖金灵 36becfb8d6 Merge pull request '1' (#166) from feature/0207zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/166
4 years ago
廖金灵 81ac1baaf1 Merge pull request '额外额度计算修改' (#167) from feature/TestingResource-0205 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/167
4 years ago
liyang 65ca417a2e 推广后台资源申请页面 4 years ago
liyang e008e14046 额外额度计算修改 4 years ago
tping fb3bcdd107 1 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
chenzhi c936ee528c 优化取消时间导出错误 4 years ago
liyang 769a6974ab 额外额度、申请批次修改 4 years ago
郑永星 84d6d1c145 Merge pull request '2.7号功能提交' (#161) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/161
4 years ago
zhengyongxing 6dce14520e 2.7号功能提交 4 years ago
郑永星 2a3446b56c Merge pull request '2.7号功能提交' (#159) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/159
4 years ago
zhengyongxing 92d6f504e8 2.7号功能提交 4 years ago
郑永星 4e6e402f71 Merge pull request '2.7号功能提交' (#158) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/158
4 years ago
zhengyongxing 347facea89 2.7号功能提交 4 years ago
郑永星 bf2851b11d Merge pull request '2.7号功能提交' (#157) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/157
4 years ago
zhengyongxing fec3c76ac1 2.7号功能提交 4 years ago