elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 3529e2b819 Merge branch 'hotfix/game_static_fix' into master_out ELF 2021-04-01 15:59:08 +0800
  • 06a7212b20 优化 ELF 2021-04-01 15:58:45 +0800
  • ecdbdf86b3 Merge pull request '版本更新' (#265) from release into master 廖金灵 2021-04-01 15:27:15 +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
  • 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
  • fe5a24f530 Merge branch 'feature/upgrade_pack' into master_out ELF 2021-03-30 15:52:31 +0800
  • 0af353e2da 优化 ELF 2021-03-30 15:52:13 +0800
  • df58c63c96 优化 ELF 2021-03-29 16:50:23 +0800
  • 260ef91ce8 Merge pull request '修改测试资源跨区bug' (#247) from hotfix/testing_resource_over_bug into master 廖金灵 2021-03-29 15:10:31 +0800
  • ca9092bf75 优化 ELF 2021-03-29 14:21:48 +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
  • 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
  • 560fc4e4ba 优化 ELF 2021-03-24 18:39:14 +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
  • 7ca675b520 优化推广员统计 chenzhi 2021-03-23 11:01:36 +0800
  • 6c46dd0ea5 优化汇总 chenzhi 2021-03-23 10:47:30 +0800
  • f5cb94123b Merge pull request '版本更新' (#234) from release into master 廖金灵 2021-03-22 20:32:22 +0800
  • 15fc1e966f Merge branch 'master' of 8.136.139.249:wmtx/platform into release ELF 2021-03-22 20:31:26 +0800
  • 60f8fef0b9 Merge pull request '版本更新' (#233) from feature/testing_game_server into release 廖金灵 2021-03-22 20:19:48 +0800
  • abb88719b5 新增表同步 chenzhi 2021-03-22 18:28:27 +0800
  • a2bd05ceac Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server ELF 2021-03-22 16:42:48 +0800
  • a4bbe4fe39 Merge pull request '修复' (#232) from feature/LY0309 into release 廖金灵 2021-03-22 16:42:34 +0800
  • 7bb9aa833c 优化 ELF 2021-03-22 16:42:04 +0800
  • a960ed7c0c 修复 liyang 2021-03-22 16:24:57 +0800
  • e5d4c2e231 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server ELF 2021-03-22 15:27:50 +0800
  • 1b4fb17d2c Merge pull request 'feature/LY0309' (#231) from feature/LY0309 into release 廖金灵 2021-03-22 15:27:29 +0800
  • 5bf8961f14 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server ELF 2021-03-22 15:16:16 +0800
  • 8dee426c5f 优化 ELF 2021-03-22 15:15:47 +0800
  • da588a3d86 修复 liyang 2021-03-22 10:51:30 +0800
  • 9973e72bf3 Merge pull request 'feature/add_item' (#229) from feature/add_item into master 廖金灵 2021-03-22 10:26:11 +0800
  • 77532bdb08 Merge pull request 'feature/add_item' (#230) from feature/add_item into release 郑永星 2021-03-22 09:26:26 +0800
  • 97fae33c43 公会信息功能提交 zhengyongxing 2021-03-22 09:23:15 +0800
  • f69b0ddf14 公会信息功能提交 zhengyongxing 2021-03-22 09:16:26 +0800
  • 42a8fc94f7 角色查询-本推广号 liyang 2021-03-19 18:32:19 +0800
  • 57abd846c6 新增财务汇总重算 chenzhi 2021-03-19 17:04:01 +0800
  • 841e875e40 Merge pull request '结算单编辑功能负数可编辑' (#228) from feature/add_item into release 郑永星 2021-03-19 16:53:09 +0800
  • d7f13aad93 结算单编辑功能负数可编辑 zhengyongxing 2021-03-19 16:51:54 +0800
  • 7f3f3997fd Merge pull request 'feature/LY0309' (#224) from feature/LY0309 into release 廖金灵 2021-03-19 16:51:20 +0800
  • d24d98d11d Merge pull request '市场业绩bug修复' (#227) from feature/add_item into release 郑永星 2021-03-19 15:56:34 +0800
  • 22b17c5010 市场业绩系统bug修复 zhengyongxing 2021-03-19 15:55:36 +0800
  • c06b954bf7 市场业绩bug修复 zhengyongxing 2021-03-19 15:48:27 +0800
  • 5fea16b821 Merge pull request '市场业绩bug修正' (#226) from feature/add_item into release 郑永星 2021-03-19 15:34:56 +0800
  • 7c60d8321b 市场业绩bug修正 zhengyongxing 2021-03-19 15:31:53 +0800
  • 5cd8ca2857 角色查询、额外额外、测试资源权限修改 liyang 2021-03-19 14:53:25 +0800
  • a457750390 角色查询、额外额度、测试资源权限修改 liyang 2021-03-19 14:46:21 +0800
  • 2690db95ab Merge pull request 'feature/finance_payment_20210115' (#223) from feature/finance_payment_20210115 into master 廖金灵 2021-03-19 14:09:30 +0800
  • 6051f9ee2a Merge pull request '子系统上游修正' (#222) from feature/add_item into release 郑永星 2021-03-19 14:04:59 +0800
  • b19d73388b 子站游戏订单bug chenzhi 2021-03-19 14:04:28 +0800
  • 68c873983b 子系统上游修正 zhengyongxing 2021-03-19 13:44:46 +0800
  • ce90ddf3ad 优化推广员统计 chenzhi 2021-03-19 11:42:01 +0800
  • 8e571e0808 Merge pull request 'feature/finance_payment_20210115' (#219) from feature/finance_payment_20210115 into master 廖金灵 2021-03-19 10:44:50 +0800
  • c91206c176 优化推广员统计 chenzhi 2021-03-19 10:42:43 +0800
  • 7c460cdb47 优化支付导出 chenzhi 2021-03-18 18:15:54 +0800
  • 9b9e1871a7 Merge pull request '子系统升级' (#218) from release into master 廖金灵 2021-03-18 15:45:57 +0800
  • b4277c2276 Merge pull request '优化订单换绑到江息' (#217) from feature/finance_payment_20210115 into release 陈志 2021-03-18 15:04:49 +0800