Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 9f5463dd3d Merge pull request '4.22号功能提交' (#283) from feature/add_item into release 郑永星 2021-04-22 09:31:47 +0800
• 69566e1839 4.22号功能提交 zhengyongxing 2021-04-22 09:28:11 +0800
• d314e6164a 4.22号功能提交 zhengyongxing 2021-04-22 09:20:31 +0800
• 72f69bd079 优化提示 chenzhi 2021-04-21 16:40:35 +0800
• 4dd36afd45 优化icon大小限制 chenzhi 2021-04-21 16:35:46 +0800
• d5a8c97ad3 优化图片上传 chenzhi 2021-04-21 16:35:16 +0800
• 537c496793 优化图片上传 chenzhi 2021-04-21 16:32:23 +0800
• 90dc521e2a Merge pull request 'hotfix/fiance_statement_bug_20210420' (#282) from hotfix/fiance_statement_bug_20210420 into release 陈志 2021-04-20 16:55:55 +0800
• b71995aeeb Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420 chenzhi 2021-04-20 16:54:54 +0800
• 8375c5f9bd Merge pull request '优化独立减罚' (#280) from hotfix/fiance_statement_bug_20210420 into master 廖金灵 2021-04-20 16:31:08 +0800
• f999eb4faf Merge pull request '迁移优化' (#281) from hotfix/shift_repeat_bug into master 廖金灵 2021-04-20 16:30:42 +0800
• c575d4f590 优化独立减罚 chenzhi 2021-04-20 16:25:57 +0800
• b5e8cc4ecb Merge pull request '4.22号功能提交' (#279) from feature/add_item into release 郑永星 2021-04-20 11:01:00 +0800
• a5aa8ef744 4.22号功能提交 zhengyongxing 2021-04-20 10:52:32 +0800
• d082a7dc98 Merge pull request '4.22号功能提交' (#277) from feature/add_item into release 郑永星 2021-04-20 10:31:00 +0800
• 8fb73e6fed 4.22号功能提交 zhengyongxing 2021-04-20 10:28:02 +0800
• bfa0c5c5b8 迁移优化 ELF 2021-04-19 17:34:20 +0800
• 6d03ea4942 Merge pull request 'feature/finance_payment_20210115' (#276) from feature/finance_payment_20210115 into release 陈志 2021-04-16 16:40:54 +0800
• 06202851c2 新增退款统计 chenzhi 2021-04-16 16:40:12 +0800
• f349603e7c 新增游戏订单退款 chenzhi 2021-04-15 16:28:41 +0800
• 80fe58ee20 Merge pull request 'feature/add_item' (#275) from feature/add_item into release 郑永星 2021-04-15 09:55:19 +0800
• 9080d521fd 4.22号功能提交 zhengyongxing 2021-04-15 09:41:24 +0800
• a2dec0e79b Merge pull request '强制跳转ios' (#274) from hotfix/landing_force_ios into master 廖金灵 2021-04-13 15:57:14 +0800
• 35e879d084 优化 ELF 2021-04-13 15:56:31 +0800
• 9eadb9e0c3 优化 ELF 2021-04-13 15:53:43 +0800
• c10c81745e Merge pull request '玩家列表修改' (#273) from feature/LY0407 into release 廖金灵 2021-04-13 15:02:45 +0800
• f32d51480f 玩家列表修改 liyang 2021-04-12 20:32:50 +0800
• f5566264d9 Merge pull request '特殊补点bug修改' (#272) from feature/add_item into master 廖金灵 2021-04-12 14:24:37 +0800
• 72077477ed 特殊补点bug修改 zhengyongxing 2021-04-12 14:22:03 +0800
• 036ef1943c Merge pull request 'feature/finance_payment_20210115' (#270) from feature/finance_payment_20210115 into master 廖金灵 2021-04-08 13:53:23 +0800
• c0f98f71a5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-04-06 13:42:02 +0800
• 74100558e5 Merge pull request '工会统计bug修正' (#267) from feature/add_item into master 廖金灵 2021-04-06 12:14:04 +0800
• 65e0fda02f 工会统计bug修正 zhengyongxing 2021-04-06 11:41:24 +0800
• 4166112252 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-04-06 11:19:41 +0800
• 6537ed25a1 Merge pull request '归属游戏上传' (#266) from feature/add_item into master 廖金灵 2021-04-02 17:25:26 +0800
• a48f0214c7 归属游戏上传 zhengyongxing 2021-04-02 17:23:35 +0800
• 53ae4b0f0e Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-04-02 16:53:29 +0800
• 6d92d9e21c 优化菜单操作 chenzhi 2021-04-02 15:56:48 +0800
• 17945097ce 优化导出 chenzhi 2021-04-01 16:07:31 +0800
• a327627f85 优化行为日志导出 chenzhi 2021-04-01 15:50:06 +0800
• bae615bac0 优化子站行为日志 chenzhi 2021-04-01 15:27:53 +0800
• ecdbdf86b3 Merge pull request '版本更新' (#265) from release into master 廖金灵 2021-04-01 15:27:15 +0800
• 6c9ae2332b 优化管理员添加 chenzhi 2021-04-01 15:06:17 +0800
• bea2fa7003 优化管理组子站点功能 chenzhi 2021-04-01 13:53:29 +0800
• 2e21ea7c38 Merge pull request '财务打款系统bug修复' (#264) from feature/add_item into release 郑永星 2021-03-31 20:13:22 +0800
• 99d281b8e1 财务打款系统bug修复 zhengyongxing 2021-03-31 20:12:11 +0800
• d9bb095056 Merge pull request '财务打款系统bug修复' (#263) from feature/add_item into release 郑永星 2021-03-31 19:56:14 +0800
• c772aa6854 财务打款系统bug修复 zhengyongxing 2021-03-31 19:55:02 +0800
• 9ad37cde30 Merge pull request '财务打款系统bug修复' (#262) from feature/add_item into release 郑永星 2021-03-31 18:56:57 +0800
• c1c0e3ac14 财务打款系统bug修复 zhengyongxing 2021-03-31 18:55:36 +0800
• e5a2f7ceea Merge pull request '财务打款系统bug修复' (#261) from feature/add_item into release 郑永星 2021-03-31 18:28:39 +0800
• 0d5ab01f32 财务打款系统bug修复 zhengyongxing 2021-03-31 18:27:28 +0800
• 1239b87ce1 Merge pull request '财务打款系统bug修复' (#260) from feature/add_item into release 郑永星 2021-03-31 18:11:20 +0800
• 860d389700 财务打款系统bug修复 zhengyongxing 2021-03-31 18:10:57 +0800
• 73969d69b8 Merge pull request '财务打款系统bug修复' (#259) from feature/add_item into release 郑永星 2021-03-31 17:49:18 +0800
• f675357a2d 财务打款系统bug修复 zhengyongxing 2021-03-31 17:47:47 +0800
• fc567339db Merge pull request '财务打款系统bug修复' (#255) from feature/add_item into release 郑永星 2021-03-31 17:35:09 +0800
• cddf09db60 财务打款系统bug修复 zhengyongxing 2021-03-31 17:33:29 +0800
• eda3c9bbe4 财务打款系统bug修复 zhengyongxing 2021-03-31 17:29:43 +0800
• f5b8c5d0dc Merge pull request '商务汇总修改' (#254) from feature/add_item into release 郑永星 2021-03-31 17:27:39 +0800
• 110e5001ee 商务汇总修改 zhengyongxing 2021-03-31 17:26:21 +0800
• 9fd18898a1 Merge pull request '商务奖金功能修改' (#252) from feature/add_item into release 郑永星 2021-03-31 17:14:41 +0800
• 859fce06c4 商务奖金功能修改 zhengyongxing 2021-03-31 17:13:42 +0800
• 5ba38df841 Merge pull request '财务打款系统bug修复' (#251) from feature/add_item into release 郑永星 2021-03-31 15:58:01 +0800
• 7178181ebb 财务打款系统bug修复 zhengyongxing 2021-03-31 15:56:51 +0800
• 2ad1ff5434 优化加入组别 chenzhi 2021-03-31 14:50:15 +0800
• 7355546a58 优化新增用户组 chenzhi 2021-03-31 11:12:01 +0800
• 4a302f6743 Merge pull request '财务打款系统bug修复' (#249) from feature/add_item into release 郑永星 2021-03-31 10:17:02 +0800
• 01a0d7c717 财务打款系统bug修复 zhengyongxing 2021-03-31 10:16:03 +0800
• f3cb29bd31 Merge pull request '商务奖金功能上传' (#248) from feature/add_item into release 郑永星 2021-03-31 10:11:16 +0800
• f474095a24 Merge branches 'feature/add_item' and 'release' of 8.136.139.249:wmtx/platform into feature/add_item_new zhengyongxing 2021-03-31 10:08:47 +0800
• 619d9d547e 商务奖金功能上传 zhengyongxing 2021-03-31 10:03:44 +0800
• 8f7405bb17 优化权限 chenzhi 2021-03-30 17:38:57 +0800
• 260ef91ce8 Merge pull request '修改测试资源跨区bug' (#247) from hotfix/testing_resource_over_bug into master 廖金灵 2021-03-29 15:10:31 +0800
• ae2fcae2a4 Merge pull request '优化' (#246) from hotfix/testing_resource_over_bug into release 廖金灵 2021-03-29 12:00:53 +0800
• c7341d149d 优化 ELF 2021-03-29 11:57:59 +0800
• 061fe402fa Merge pull request '优化' (#245) from hotfix/testing_resource_over_bug into release 廖金灵 2021-03-29 10:46:02 +0800
• c7b90f54a6 优化 ELF 2021-03-26 19:30:42 +0800
• de83318ee8 Merge pull request '测试资源' (#244) from hotfix/testing_resource_over_bug into release 廖金灵 2021-03-26 18:46:55 +0800
• 5c034c3c7b Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/testing_resource_over_bug ELF 2021-03-26 18:46:09 +0800
• d7d78e748d 修改跨区bug ELF 2021-03-26 18:41:13 +0800
• 5ea5bb2eaa 优化子站登陆 chenzhi 2021-03-26 17:22:42 +0800
• 2a168fb907 优化子站登陆所需函数 chenzhi 2021-03-26 14:51:11 +0800
• 8323361a9e Merge pull request '强制落地页转换' (#243) from hotfix/force_landing_page into master 廖金灵 2021-03-25 19:25:34 +0800
• 65376b9a2f Merge pull request '优化' (#242) from hotfix/force_landing_page into release 廖金灵 2021-03-25 19:16:04 +0800
• 15e1fff0ac 优化 ELF 2021-03-25 19:15:09 +0800
• d3e7aeeb1e Merge pull request '强制落地页以某种系统显示' (#241) from hotfix/force_landing_page into release 廖金灵 2021-03-25 19:13:31 +0800
• 5d92af7dcc 优化 ELF 2021-03-25 19:11:21 +0800
• 69301ee537 Merge pull request '优化子站上游比例按实际结算' (#240) from feature/finance_payment_20210115 into master 廖金灵 2021-03-25 13:52:26 +0800
• 6c3aefcf55 优化子站上游比例按实际结算 chenzhi 2021-03-25 11:14:03 +0800
• bcc0bb2536 Merge pull request '1' (#239) from hotfix/0323 into master 廖金灵 2021-03-23 18:31:46 +0800
• e7d65249b5 Merge pull request 'hotfix/0323' (#238) from hotfix/0323 into release 张谷成 2021-03-23 18:29:04 +0800
• 9d478c0bc7 1 tping 2021-03-23 18:22:31 +0800
• 64a4923564 Merge pull request '财务打款系统bug修复' (#237) from feature/add_item into master 廖金灵 2021-03-23 16:25:47 +0800
• 2892562b2c 财务打款系统bug修复 zhengyongxing 2021-03-23 16:21:52 +0800
• fc878671f7 Merge pull request 'feature/finance_payment_20210115' (#236) from feature/finance_payment_20210115 into master 廖金灵 2021-03-23 14:47:54 +0800
• 96f832322c Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-03-23 14:42:18 +0800
• 3b447b70d0 优化公会统计 chenzhi 2021-03-23 14:35:29 +0800
• d6dfae336b Merge pull request '修改九天仙尘落地页名称显示' (#235) from hotfix/special_game_name into master 廖金灵 2021-03-23 12:18:52 +0800
• 6bc17ad982 修改九天仙尘落地页名称显示 ELF 2021-03-23 12:16:56 +0800