elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,143 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

6924 Commits (57f57b8a1d01bc38972b4cd006f4c38ae81ae9b3)

Author SHA1 Message Date
廖金灵 82a40a79bd Merge pull request 'feature/more_payment' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/388
廖金灵 84a6b21f88 Merge pull request '优化' () from hotfix/remove_promote_package into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/390
ELF 9fb91c4a66 优化
chenzhi 9abd3896f7 新增提醒
chenzhi 626c63fe89 取消汇总不结算信息
chenzhi 497d3f8f61 优化计算及导出
chenzhi db28185af3 优化毛利统计方式
chenzhi ff7f2d7469 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi d60330a093 新增商户支付导出
廖金灵 742bb493c1 Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/387
ELF 4e1cf805ea 优化
ELF 98c938c814 优化
ELF 78a24c78f5 优化
chenzhi 31fa1fcfc2 上游cp新增是否过期查询
chenzhi 24e4f77a98 毛利现在bug打印
chenzhi 4d8e7de144 新增打款确认优化
chenzhi 2d1da379b0 新增生效配置
chenzhi 79c52576c2 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 56fa287357 优化导出
chenzhi 648fb3ebbf 优化内部公司改进
chenzhi 4b1935676b 新增内外团查询
chenzhi e274f863a8 新增内部公司部门查询
廖金灵 a0a1c5635e Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/378
ELF 6d5d40dfd2 优化
ELF d6efc36e9a 优化
廖金灵 642bcefd59 Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/375
ELF 53bf6bca07 优化
ELF b65a62b6ab 优化
ELF b8de662556 优化
廖金灵 175cfbf71c Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/372
ELF 9f37c6db3c 有害
ELF fb12b1345e 有害
ELF 4abcad9106 有害
ELF b495135215 有害
ELF 23feb76e09 有害
ELF b9092a4501 有害
ELF b4c1c68c42 优化
chenzhi c36ce00b60 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi c4849ffc7c 新增商户固定
ELF 80e02733e7 封禁推广员推广链接
廖金灵 f568c40e22 Merge pull request '金额错误bug修改' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/363
zhengyongxing b1c82bfd69 金额错误bug修改
zhengyongxing b58bdab705 金额错误bug修改
廖金灵 9e44ad5fe3 Merge pull request '5.27新功能时间修改' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/362
zhengyongxing a4bf7ff108 5.27新功能时间修改
廖金灵 cd33286900 Merge pull request '优化导出错误' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/361
chenzhi ad49a9a419 优化导出错误
廖金灵 f5e42522bf Merge pull request 'feature/more_payment' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/359
chenzhi f211fe6fa7 优化批量导出
廖金灵 bba10a23b1 Merge pull request '5.27新功能上线' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/358
zhengyongxing 8abf4e4eb8 5.27新功能上线
chenzhi 3b725f9c1d 新增汇总查看
chenzhi db0d49fe4b 优化合并查看
廖金灵 f556d7889e Merge pull request '修改' () from release into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/357
郑永星 6b10bc1b05 Merge pull request '5.26功能上线' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/355
zhengyongxing 0c5dfdebf9 5.26功能上线
chenzhi e95087060a 优化上游逻辑
chenzhi 6df1f871f2 优化设置后的其他比例问题
陈志 a0c9d6e7a9 Merge pull request 'hotfix/change_pay_0526' () from hotfix/change_pay_0526 into release 
优化名称
chenzhi 543fc37ba2 优化名称
郑永星 24728cf1ec Merge pull request '5.26功能上线' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/352
zhengyongxing e710d5a710 5.26功能上线
chenzhi 7f9d2e3c97 优化类大小写
chenzhi 811587a33f 优化导出不和重算关联
陈志 a187b17cdd Merge pull request 'feature/more_payment' () from feature/more_payment into release 
优化上游比例
chenzhi 7aa29e8f3f 优化每月计算及导出
chenzhi 1728886f1f 优化上游比例
chenzhi 06f5882107 格式化数据
zhengyongxing 123ee98c59 5.26功能上线
zhengyongxing 5aeff6e3f2 5.26功能上线
zhengyongxing 7265ddd23e 5.26功能上线
chenzhi 9631a26d40 优化结算
郑永星 fcf3e09c1b Merge pull request '5.26功能上线' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/344
zhengyongxing 4f0bad5c45 5.26功能上线
chenzhi 013801556a 新增游戏分成比例操作时间
chenzhi fd285df021 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 2ac55db936 优化导出名称
chenzhi 3dca998277 优化权限
chenzhi f269a3a961 优化导出
chenzhi 78b85d9b37 新增导出
chenzhi 365faa99a7 新增重算功能
chenzhi 7caaf75647 优化编辑和重算
chenzhi 34b30c70f6 新增编辑功能
廖金灵 3edcb05ed9 Merge pull request '比例体系修改' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/340
zhengyongxing e7c83a2811 比例体系修改
廖金灵 daca7679ad Merge pull request '比例体系修改' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/339
chenzhi cf06897d66 新增游戏毛利表
zhengyongxing 9c2c771be9 比例体系修改
廖金灵 af92816205 Merge pull request '比例体系修改' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/338
zhengyongxing 8749beec32 比例体系修改
ELF 45cea9fa42 有害
廖金灵 eec3495340 Merge pull request '有害' () from feature/op_player_shift into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/334
张谷成 d254e7be32 Merge pull request '0521' () from feature/company0521 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/333
ELF 450c8e517b 有害
tping 7b694b2fc8 0521
廖金灵 95da7866d1 Merge pull request 'feature/op_player_shift' () from feature/op_player_shift into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/332
ELF 90d82b1a8d 有害
ELF 8440c5d384 优化
郑永星 b603435c8f Merge pull request 'feature/add_item' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/331
zhengyongxing 54b9373b2b 比例体系修改
zhengyongxing 6d3b5f05b4 比例体系修改
廖金灵 2722b4d8a6 Merge pull request '优化' () from feature/retention_60_90 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/330
ELF 45460144f2 优化
廖金灵 6f7ac28ac1 Merge pull request '优化' () from feature/retention_60_90 into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/329
郑永星 ec656777b2 Merge pull request '比例体系修改' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/328
zhengyongxing cd41447eb8 比例体系修改
chenzhi c7c4b52c89 现在下游外团分析
chenzhi 180deeb2ae bug
chenzhi f07b29714b 新增上游分析
chenzhi be8e24c122 新增下游外团毛利
郑永星 6f1f95adc9 Merge pull request '添加用户bug修改' () from feature/add_item into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/325
zhengyongxing da8cd1e984 添加用户bug修改
廖金灵 4824b34681 Merge pull request 'hotfix/cz_auth_bug' () from hotfix/cz_auth_bug into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/323
ELF 4348e3f435 优化
ELF a9ec0f0116 优化
zhengyongxing bc975c99d6 添加用户bug修改
zhengyongxing ede3c9379e Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_new
zhengyongxing 4a0477f8c4 5.19功能提交
ELF 8da0b1b4b7 有害
廖金灵 006aefd39c Merge pull request '目录索引' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/317
chenzhi 637746148f 目录索引
廖金灵 1e6ef0bf59 Merge pull request 'feature/more_payment' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/316
chenzhi 70fb39424c 优化名称
chenzhi 9c0e6f7c9e 优化名称
廖金灵 5887df2dd7 Merge pull request 'feature/more_payment' () from feature/more_payment into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/315
chenzhi 434009bd18 优化名称
chenzhi 76175989ed 优化余额说明
陈志 2bdf225963 Merge pull request 'feature/more_payment' () from feature/more_payment into release 
优化打款
chenzhi c9696df7ab 优化打款配置
chenzhi c232b649a0 优化线下打款样式
chenzhi d78a1edc8c 优化线下打款
chenzhi 44ceb3ead3 优化线下打款
chenzhi 5a303a6a7a 优化保存
chenzhi a9951bd657 优化保存
chenzhi 30d6f53582 优化渠道计算
chenzhi bb2656f207 优化代码
chenzhi 844a6d501e 新增打款账号编辑
廖金灵 0cacbd3cb7 Merge pull request 'hotfix/ymxj_testing_resource' () from hotfix/ymxj_testing_resource into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/312
ELF 6d5cd97811 优化
ELF 0c3ada79dc 优化
廖金灵 0ca0b8ab4f Merge pull request '优化' () from hotfix/ymxj_testing_resource into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/311
ELF 66af4f551a 优化
廖金灵 84c6612093 Merge pull request 'bug修复' () from feature/add_item into master 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/310
zhengyongxing cd1fd63681 bug修复
ELF fea86b964c 优化
ELF 0dbc10498b 解决冲突
ELF 11b9ec62ba 优化
廖金灵 6abebc1a3c Merge pull request '乐牛添加测试资源' () from hotfix/leniu_testing_res into release 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/305
ELF 0888779250 优化
陈志 1521212db1 Merge pull request '新增频繁操作提示页面' () from feature/hom_defaultpage into release 
新增频繁操作提示页面