Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 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
• b75bcdbb1c 新增上游导出查看 chenzhi 2021-02-23 20:56:36 +0800
• b7a120c56a Merge pull request '2.10号功能提交' (#172) from feature/add_item into release 郑永星 2021-02-20 09:41:45 +0800
• c2bfcd39b6 2.10号功能提交 zhengyongxing 2021-02-20 09:41:21 +0800
• f078bfd8b6 Merge pull request '2.10号功能提交' (#171) from feature/add_item into release 郑永星 2021-02-08 15:05:45 +0800
• 4419f1539c 2.10号功能提交 zhengyongxing 2021-02-08 14:51:51 +0800
• 3c760984ab Merge pull request '2.10号功能提交' (#170) from feature/add_item into release 郑永星 2021-02-08 09:48:00 +0800
• 9b2f7b1a61 2.10号功能提交 zhengyongxing 2021-02-08 09:46:48 +0800
• 10707657c5 Merge pull request '版本上线' (#169) from release into master 廖金灵 2021-02-07 22:11:28 +0800
• 6d60674031 Merge pull request '优化永星bug' (#168) from feature/finance_payment_20210115 into release 陈志 2021-02-07 18:24:03 +0800
• 098ba97d3e 优化永星bug chenzhi 2021-02-07 18:22:10 +0800
• 36becfb8d6 Merge pull request '1' (#166) from feature/0207zgc into release 廖金灵 2021-02-07 14:23:45 +0800
• 81ac1baaf1 Merge pull request '额外额度计算修改' (#167) from feature/TestingResource-0205 into release 廖金灵 2021-02-07 14:23:32 +0800
• 65ca417a2e 推广后台资源申请页面 liyang 2021-02-07 14:20:58 +0800
• e008e14046 额外额度计算修改 liyang 2021-02-07 12:25:07 +0800
• fb3bcdd107 1 tping 2021-02-07 10:43:24 +0800
• e84f8c174a Merge pull request '优化' (#165) from feature/testing_quota_up into release 廖金灵 2021-02-07 10:35:24 +0800
• 8a815af691 优化 ELF 2021-02-07 10:34:27 +0800
• 82d8487bf9 Merge pull request '额外额度备注信息显示' (#164) from feature/TestingResource-0205 into release 廖金灵 2021-02-07 10:18:03 +0800
• 4a69622b01 额外额度备注信息显示 ly 2021-02-07 10:01:13 +0800
• 29be3bf6b8 Merge pull request '优化取消时间导出错误' (#163) from feature/finance_payment_20210115 into release 陈志 2021-02-06 18:47:58 +0800
• c936ee528c 优化取消时间导出错误 chenzhi 2021-02-06 18:46:58 +0800
• e17eeae704 Merge pull request '额外额度、申请批次修改' (#162) from feature/TestingResource-0205 into release 廖金灵 2021-02-05 18:11:18 +0800
• 769a6974ab 额外额度、申请批次修改 liyang 2021-02-05 17:50:06 +0800
• 84d6d1c145 Merge pull request '2.7号功能提交' (#161) from feature/add_item into release 郑永星 2021-02-05 15:52:00 +0800
• 6dce14520e 2.7号功能提交 zhengyongxing 2021-02-05 15:51:36 +0800
• 2a3446b56c Merge pull request '2.7号功能提交' (#159) from feature/add_item into release 郑永星 2021-02-05 10:16:20 +0800
• 92d6f504e8 2.7号功能提交 zhengyongxing 2021-02-05 10:16:05 +0800
• 4e6e402f71 Merge pull request '2.7号功能提交' (#158) from feature/add_item into release 郑永星 2021-02-05 10:03:22 +0800
• 347facea89 2.7号功能提交 zhengyongxing 2021-02-05 10:01:24 +0800
• bf2851b11d Merge pull request '2.7号功能提交' (#157) from feature/add_item into release 郑永星 2021-02-04 17:26:55 +0800
• fec3c76ac1 2.7号功能提交 zhengyongxing 2021-02-04 17:25:25 +0800
• b060f3302d Merge pull request '2.7号功能提交' (#156) from feature/add_item into release 郑永星 2021-02-04 11:11:58 +0800
• b2231ff63b 2.7号功能提交 zhengyongxing 2021-02-04 11:11:31 +0800
• 4adfc5389c Merge pull request 'feature/finance_payment_20210115' (#155) from feature/finance_payment_20210115 into release 陈志 2021-02-03 19:30:42 +0800
• 3997bc4b17 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-02-03 19:30:10 +0800
• 2f90e19f1f 移除个人导出打款状态 chenzhi 2021-02-03 19:28:52 +0800
• b592554501 Merge branch 'feature/testing_daily_count' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-02-03 18:30:42 +0800
• 9b3b982df7 Merge pull request '优化所属会长判断' (#154) from feature/testing_daily_count into release 陈志 2021-02-03 18:26:59 +0800
• d7a787c0fc 优化所属会长判断 chenzhi 2021-02-03 18:26:34 +0800
• 12eb8aa9f0 Merge pull request '2.7号功能提交' (#153) from feature/add_item into release 郑永星 2021-02-03 18:23:28 +0800
• a28c71ecb8 Merge pull request 'feature/testing_daily_count' (#152) from feature/testing_daily_count into release 陈志 2021-02-03 18:22:02 +0800
• 53ba2c7698 2.7号功能提交 zhengyongxing 2021-02-03 18:22:02 +0800
• 290b48dc3b 优化测试统计导出 chenzhi 2021-02-03 18:18:05 +0800
• dac66eaf78 Merge pull request '更新bug' (#151) from hotfix/payment_bug_0203 into master 廖金灵 2021-02-03 16:58:42 +0800
• 4e5f6a664d 更新bug chenzhi 2021-02-03 16:43:59 +0800
• a9e53ea354 Merge pull request '新增线上线下结算统计' (#150) from feature/finance_payment_20210115 into release 陈志 2021-02-03 14:07:59 +0800
• ff9ab580c9 Merge pull request '修改推广后台订单查询bug' (#149) from hotfix/0203 into master 廖金灵 2021-02-03 12:35:40 +0800
• 76f6c77160 Merge pull request '1' (#148) from hotfix/0203 into release 张谷成 2021-02-03 12:33:27 +0800
• f3efd97a19 1 tping 2021-02-03 12:32:46 +0800
• b715e5c07e Merge branch 'hotfix/0203' into release ELF 2021-02-03 12:20:46 +0800
• 792508bd64 1 tping 2021-02-03 12:12:35 +0800
• e5b6af3771 1 tping 2021-02-03 12:09:56 +0800
• e2882cc5aa 新增线上线下结算统计 chenzhi 2021-02-03 11:54:24 +0800
• ef4f69b359 Merge pull request 'feature/0207zgc' (#146) from feature/0207zgc into release 张谷成 2021-02-03 11:34:42 +0800
• d14cb334af Merge branch 'release' into feature/0207zgc tping 2021-02-03 11:32:46 +0800
• fbf0b27ca3 推广后台充值导出 tping 2021-02-03 11:32:08 +0800
• fca978ae2c Merge pull request 'feature/finance_payment_20210115' (#145) from feature/finance_payment_20210115 into release 陈志 2021-02-02 18:03:03 +0800
• 7869d734ef Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-02-02 18:02:25 +0800
• 9cfe8abe68 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115 chenzhi 2021-02-02 18:01:38 +0800