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

Commit Graph

  • 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
  • 9958c8a281 Merge pull request 'release' (#189) from release into master 廖金灵 2021-03-01 17:58:12 +0800
  • a26b10ab2c Merge pull request 'feature/finance_payment_20210115' (#188) from feature/finance_payment_20210115 into release 陈志 2021-03-01 17:49:23 +0800
  • a33ea0d575 优化上游 chenzhi 2021-03-01 17:48:31 +0800
  • e8dea24f46 新增周结 chenzhi 2021-03-01 17:28:40 +0800
  • a85ae5125c Merge pull request '优化子站平台币充值区分万盟' (#187) from feature/finance_payment_20210115 into release 陈志 2021-03-01 16:03:09 +0800
  • 55572ce862 优化子站平台币充值区分万盟 chenzhi 2021-03-01 14:17:02 +0800
  • 0c465ef26d Merge pull request '2.28号功能提交' (#186) from feature/add_item into release 郑永星 2021-03-01 14:15:55 +0800
  • 886bbfcfc2 2.28号功能提交 zhengyongxing 2021-03-01 14:14:45 +0800
  • 1b86292c4e Merge pull request '2.28号功能提交' (#185) from feature/add_item into release 郑永星 2021-03-01 13:46:06 +0800
  • 73beadd929 2.28号功能提交 zhengyongxing 2021-03-01 13:43:28 +0800
  • d73e2bae02 Merge pull request '2.28号功能提交' (#184) from feature/add_item into release 郑永星 2021-03-01 13:42:11 +0800
  • bc3f4f02d3 2.28号功能提交 zhengyongxing 2021-03-01 13:40:50 +0800
  • 727873e25c Merge pull request 'feature/add_item' (#183) from feature/add_item into release 郑永星 2021-03-01 13:36:34 +0800
  • 1ec35eeb32 2.28号功能提交 zhengyongxing 2021-03-01 13:34:15 +0800
  • 97e9a1328e Merge pull request '优化结算单显示' (#181) from feature/finance_payment_20210115 into release 陈志 2021-03-01 11:41:37 +0800
  • 7756efe859 优化结算单显示 chenzhi 2021-03-01 11:40:40 +0800
  • 2af6231106 2.28号功能提交 zhengyongxing 2021-03-01 10:54:31 +0800
  • 36e21f4049 Merge pull request '2.28号功能提交' (#180) from feature/add_item into release 郑永星 2021-03-01 10:48:23 +0800
  • 5556bbf171 2.28号功能提交 zhengyongxing 2021-03-01 10:46:53 +0800
  • 3e8f35ba41 Merge pull request '2.28号功能提交' (#179) from feature/add_item into release 郑永星 2021-03-01 10:29:42 +0800
  • 9837ba3682 2.28号功能提交 zhengyongxing 2021-03-01 10:28:24 +0800
  • f12dd32915 Merge pull request '2.28号功能提交' (#178) from feature/add_item into release 郑永星 2021-03-01 10:18:42 +0800
  • 0be51f4d62 2.28号功能提交 zhengyongxing 2021-03-01 10:15:32 +0800
  • 0f39caaf60 Merge pull request 'feature/add_item' (#177) from feature/add_item into release 郑永星 2021-02-27 18:40:10 +0800
  • c6587b61a5 2.28号功能提交 zhengyongxing 2021-02-27 18:38:09 +0800
  • 8e28b1c4ad 2.28号功能提交 zhengyongxing 2021-02-27 18:36:51 +0800
  • dfdcedea38 Merge pull request '2.28号功能提交' (#176) from feature/add_item into release 郑永星 2021-02-27 18:07:47 +0800
  • e278c9de76 Merge pull request '新增权限审核' (#175) from feature/finance_payment_20210115 into release 陈志 2021-02-27 18:05:33 +0800
  • 12f84844c4 新增权限审核 chenzhi 2021-02-27 18:04:47 +0800
  • 016c2e11bd 2.28号功能提交 zhengyongxing 2021-02-27 17:49:55 +0800
  • 234ce8817d Merge pull request 'feature/finance_payment_20210115' (#174) from feature/finance_payment_20210115 into release 陈志 2021-02-27 17:19:53 +0800
  • a889417f5a Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-02-27 17:18:30 +0800
  • 0b4e9fa9a1 优化重算 chenzhi 2021-02-27 17:17:34 +0800
  • 23147ac0cc Merge pull request '2.28号功能提交' (#173) from feature/add_item into release 郑永星 2021-02-27 16:53:39 +0800
  • 4425750972 2.28号功能提交 zhengyongxing 2021-02-27 16:51:54 +0800
  • 3263c108c3 新增个人结算 chenzhi 2021-02-27 13:39:48 +0800
  • c285a88c8d 优化子站生成数据 chenzhi 2021-02-26 11:15:25 +0800
  • 7d650a9595 子站内团脚本 chenzhi 2021-02-26 10:58:18 +0800
  • a439946207 优化子站启动脚本 chenzhi 2021-02-25 14:21:32 +0800
  • 4024e45c64 优化子站上游结算 chenzhi 2021-02-24 18:36:09 +0800
  • e6e8e1d0b3 暂存 chenzhi 2021-02-24 16:32:44 +0800