Commit Graph

3449 Commits (80e02733e7dda3991718bffb69bf385c7ff9d242)

Author SHA1 Message Date
廖金灵 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