Commit Graph

3578 Commits (70e00eb378f791a243597310d317b7fdd3aaf6ee)

Author SHA1 Message Date
tping badb3bca31 设置权限、admin、市场总监可以看所有数据
ELF d1aff92c99 下载bug
ELF 546abbfa72 添加奖金池总额
ELF 556e3ba624 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/remove_promote_package
ELF 1279cbfe3b 优化
chenzhi 4d3f1c04b8 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 1263383533 优化内团毛利计算公式
廖金灵 91701f3ecc Merge pull request '修复汇总导出' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/391
chenzhi d6ea8057f0 修复汇总导出
廖金灵 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 626c63fe89 取消汇总不结算信息
chenzhi 497d3f8f61 优化计算及导出
chenzhi db28185af3 优化毛利统计方式
chenzhi ff7f2d7469 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi d60330a093 新增商户支付导出
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 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 d6efc36e9a 优化
chenzhi c36ce00b60 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi c4849ffc7c 新增商户固定
廖金灵 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
优化名称
郑永星 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 优化类大小写
陈志 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 fd285df021 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi 2ac55db936 优化导出名称
chenzhi 3dca998277 优化权限
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 比例体系修改
廖金灵 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 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功能提交
廖金灵 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
陈志 2bdf225963 Merge pull request 'feature/more_payment' () from feature/more_payment into release
优化打款
chenzhi 5a303a6a7a 优化保存
chenzhi a9951bd657 优化保存
chenzhi 30d6f53582 优化渠道计算
chenzhi bb2656f207 优化代码
chenzhi 844a6d501e 新增打款账号编辑
廖金灵 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 c1a71bd5f1 Merge branch 'master' into release
廖金灵 a9fd28e38f Merge pull request 'feature/add_item' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/294
zhengyongxing b7d4e9002d 4.23号功能提交
郑永星 d1b570be2a Merge pull request '4.23号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/293
zhengyongxing 83cc2aa6ec 4.23号功能提交
陈志 34fcfc7675 Merge pull request 'hotfix/fiance_statement_bug_20210420' () from hotfix/fiance_statement_bug_20210420 into release
优化关联
chenzhi b257ee8754 优化游戏关联
郑永星 b79f567e0a Merge pull request '4.23号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/291
zhengyongxing 1a2f0ab975 4.23号功能提交
郑永星 49a4caaba6 Merge pull request '4.23号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/288
zhengyongxing 671419882f 4.23号功能提交
chenzhi aa0bcef724 Merge branch 'master' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420
廖金灵 56e28d216e Merge pull request '版本更新' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/285
郑永星 9f5463dd3d Merge pull request '4.22号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/283
zhengyongxing d314e6164a 4.22号功能提交
chenzhi 4dd36afd45 优化icon大小限制
chenzhi d5a8c97ad3 优化图片上传
chenzhi b71995aeeb Merge branch 'release' of 8.136.139.249:wmtx/platform into hotfix/fiance_statement_bug_20210420
廖金灵 8375c5f9bd Merge pull request '优化独立减罚' () from hotfix/fiance_statement_bug_20210420 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/280
chenzhi c575d4f590 优化独立减罚
郑永星 d082a7dc98 Merge pull request '4.22号功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/277
zhengyongxing 8fb73e6fed 4.22号功能提交
ELF bfa0c5c5b8 迁移优化
陈志 6d03ea4942 Merge pull request 'feature/finance_payment_20210115' () from feature/finance_payment_20210115 into release
新增退款统计
chenzhi 06202851c2 新增退款统计
chenzhi f349603e7c 新增游戏订单退款
郑永星 80fe58ee20 Merge pull request 'feature/add_item' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/275
zhengyongxing 9080d521fd 4.22号功能提交
liyang f32d51480f 玩家列表修改
廖金灵 f5566264d9 Merge pull request '特殊补点bug修改' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/272
zhengyongxing 72077477ed 特殊补点bug修改
chenzhi c0f98f71a5 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
zhengyongxing 65e0fda02f 工会统计bug修正
chenzhi 4166112252 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
zhengyongxing a48f0214c7 归属游戏上传
chenzhi 53ae4b0f0e Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/finance_payment_20210115
chenzhi 6d92d9e21c 优化菜单操作
chenzhi 17945097ce 优化导出
chenzhi a327627f85 优化行为日志导出
chenzhi bae615bac0 优化子站行为日志