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

Commit Graph

  • 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
  • c2303a0676 优化订单换绑到江息 chenzhi 2021-03-18 15:03:59 +0800
  • c754037b79 Merge pull request '财务子系统bug修改' (#216) from feature/add_item into release 郑永星 2021-03-18 14:58:05 +0800
  • 2f9a822583 财务子系统bug修改 zhengyongxing 2021-03-18 14:55:09 +0800
  • 46c1cb615b Merge pull request '优化子站列表' (#212) from feature/finance_payment_20210115 into release 陈志 2021-03-18 11:51:45 +0800
  • 4f14228bab 优化子站列表 chenzhi 2021-03-18 11:50:48 +0800
  • 4e33c653f6 Merge pull request 'feature/finance_payment_20210115' (#211) from feature/finance_payment_20210115 into release 陈志 2021-03-18 11:03:15 +0800
  • a03993f251 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-03-18 11:01:20 +0800
  • 8617ad3e91 Merge branch 'release' of http://8.136.139.249:3000/wmtx/platform into feature/LY0309 liyang 2021-03-18 09:38:30 +0800
  • 1b7dae2603 优化结算同步 chenzhi 2021-03-17 20:57:11 +0800
  • c21b9f619e 新增子站结算 chenzhi 2021-03-17 19:53:55 +0800
  • cb48948abe Merge pull request '3.22功能提交' (#210) from feature/add_item into release 郑永星 2021-03-17 14:25:40 +0800
  • 0332b591e8 3.22功能提交 zhengyongxing 2021-03-17 14:24:29 +0800
  • 8d871290f2 优化默认公司 chenzhi 2021-03-17 11:13:51 +0800
  • 7df5d12747 Merge pull request 'feature/add_item' (#206) from feature/add_item into release 郑永星 2021-03-17 09:18:43 +0800
  • 748f99f758 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item zhengyongxing 2021-03-17 09:18:15 +0800
  • eb8c9cebc1 3.22好功能提交 zhengyongxing 2021-03-17 09:15:18 +0800
  • 50363297e8 优化订单数据换绑 chenzhi 2021-03-16 18:42:06 +0800
  • f670c7196a 优化提示 chenzhi 2021-03-16 11:31:48 +0800
  • 6790ab5fd3 新增订单重算及固化 chenzhi 2021-03-15 18:35:01 +0800
  • 1de381bccd 优化是否结算 chenzhi 2021-03-12 14:26:26 +0800
  • bb10181cc5 新增子站游戏订单及导出 chenzhi 2021-03-11 18:23:18 +0800
  • 8b98460242 新增备注 chenzhi 2021-03-10 20:23:41 +0800
  • 17cee767b7 子站同步脚本 chenzhi 2021-03-10 20:22:18 +0800
  • 5d08b3aeea Merge pull request '财务打款系统bug修复' (#205) from feature/add_item into master 廖金灵 2021-03-10 14:02:02 +0800
  • fd34d63730 财务打款系统bug修复 zhengyongxing 2021-03-10 13:57:42 +0800
  • f8b93616ce 菜单封装中 liyang 2021-03-09 20:58:18 +0800
  • 544f03d9c0 Merge pull request 'feature/finance_payment_20210115' (#204) from feature/finance_payment_20210115 into master 廖金灵 2021-03-09 14:45:42 +0800
  • 3ee0dbcaa6 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-03-09 14:43:29 +0800
  • 59d1e31119 优化退款可以负数 chenzhi 2021-03-09 14:41:49 +0800
  • d47668b419 Merge pull request '优化重算' (#203) from feature/finance_payment_20210115 into master 廖金灵 2021-03-08 20:16:41 +0800
  • 7ed2855dc5 优化重算 chenzhi 2021-03-08 20:15:15 +0800
  • 2f284281dc Merge pull request 'feature/finance_payment_20210115' (#202) from feature/finance_payment_20210115 into master 廖金灵 2021-03-08 15:50:25 +0800
  • 708707a15a Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-03-08 15:44:29 +0800
  • e7a51c41da 优化前端入口文件 chenzhi 2021-03-08 15:44:21 +0800
  • f3a01c4c37 Merge pull request 'feature/finance_payment_20210115' (#201) from feature/finance_payment_20210115 into master 廖金灵 2021-03-04 16:48:31 +0800
  • 5f3c726a05 优化游戏统计合计 chenzhi 2021-03-04 16:34:14 +0800
  • 243dce02ca 优化聚合万盟数据 chenzhi 2021-03-04 15:25:32 +0800
  • 57bf0929b3 Merge pull request 'feature/finance_payment_20210115' (#199) from feature/finance_payment_20210115 into master 廖金灵 2021-03-03 18:12:43 +0800
  • aa99f1f668 新增审核撤回 chenzhi 2021-03-03 18:09:20 +0800
  • 88d02f7be1 优化导出提醒-zyx chenzhi 2021-03-03 17:53:39 +0800
  • a429003fa9 Merge pull request '财务子系统bug修复' (#198) from feature/add_item into master 廖金灵 2021-03-03 17:46:18 +0800
  • 3900a4081a 财务子系统bug修复 zhengyongxing 2021-03-03 17:43:27 +0800
  • ae3ad391fd 新功能开发 zhengyongxing 2021-03-03 09:20:40 +0800
  • 96c6a47dd5 Merge pull request '热更修复' (#197) from feature/add_item into master 廖金灵 2021-03-02 15:33:17 +0800
  • a84a69fd56 热更修复 zhengyongxing 2021-03-02 15:31:53 +0800
  • 3eb6fbad4d Merge pull request 'feature/add_item' (#196) from feature/add_item into release 郑永星 2021-03-02 15:18:41 +0800
  • e678cc55f8 Merge pull request '修复苹果落地页无法滚动bug' (#195) from hotfix/landing-ios-fixed into master 廖金灵 2021-03-02 15:10:47 +0800
  • 1ab1db12ab 修复苹果落地页无法滚动bug ELF 2021-03-02 15:08:59 +0800
  • e9507ddb95 Merge pull request '热更修复汇总上游时间错误' (#194) from feature/add_item into master 廖金灵 2021-03-02 14:47:45 +0800
  • 55c75e159c 热更修复 zhengyongxing 2021-03-02 14:41:42 +0800
  • df747704ba Merge pull request '2.28号功能提交' (#193) from feature/add_item into master 廖金灵 2021-03-02 12:17:10 +0800
  • 55ffc36a10 2.28号功能提交 zhengyongxing 2021-03-02 12:14:24 +0800
  • bd20d4a770 Merge pull request '2.28号功能提交' (#192) from feature/add_item into master 廖金灵 2021-03-01 18:52:48 +0800
  • 4aa569d092 2.28号功能提交 zhengyongxing 2021-03-01 18:33:23 +0800
  • c41981735b Merge pull request 'release' (#191) from release into master 廖金灵 2021-03-01 18:28:05 +0800
  • f328397807 Merge pull request 'feature/finance_payment_20210115' (#190) from feature/finance_payment_20210115 into release 陈志 2021-03-01 18:25:24 +0800
  • 75850db849 优化测试 chenzhi 2021-03-01 18:24:40 +0800
  • 0a0ee66012 优化连接 chenzhi 2021-03-01 18:21:52 +0800
  • cc59050261 优化权限添加 chenzhi 2021-03-01 18:18:59 +0800