Commit Graph

269 Commits (f21403a05bdc907686c3d4b4548e7aa19c25048b)

Author SHA1 Message Date
chenxiaojun 578d640524 管理后台->推广员->结算管理->推广提现--更新
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新
zyx 68e57ab1f5 导出链路问题修正
chenxiaojun 0787c976ef 管理后台->推广员->结算管理->推广提现--更新
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新
zyx 0ce8984c13 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx ce008b284e 月结统计bug修正
jbrazz b21df0a8f4 upt
ELF 12016f1b34 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 679acf6cf1 修改分包
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c9996e071c fix grand_id
chenzhi 58db110844 合并
chenzhi 115bafc067 新增补链日期及取消补链功能
ELF 831456b333 解决冲突
chenzhi 7e37f3a2df 优化迁移用户addshifttask
jbrazz 9300280f78 merge feture/ylw
jbrazz 2dd1372b78 upt
jbrazz db1ea1370a upt
jbrazz 5e9cfb023f uypt
Your Name f642fb2c90 游戏充值订单添加CP订单号字段
jbrazz 74be3407b1 upt
ELF a8bc52df33 修改
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 5f673b346d 月结统计添加部长渠道
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote
chenzhi 9a6c75b41d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi a653b46f0e 优化月份统计接口新增事务
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi c2e686c38e 123
chenzhi 537ed0857a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 9d09fa4665 4角色聚合
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 9e9d742275 导出添加引号
zhengchanglong 943564f82d Merge branch 'dev_zyx' into dev
zyx d5a90238ec 导出加大默认内存
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz 68df391d9c upt
zhengchanglong 0223ecb125 Merge branch 'dev_zyx' into dev
zyx 35e1b2631a 导出添加游戏订单号
zhengchanglong 945ea1173a Merge branch 'dev_zyx' into dev
zyx a307bf343e 游戏详情查看导出,按日期分成多个sheet
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev
zyx 7e4aaf0a2e Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 266202c06b 游戏详情查看导出,按日期分成多个sheet
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 51701a485d SDK菜单添加平台选型
zyx 602e53e82f 合并分支dev_zyx财务部分的代码
zhengchanglong 561b183bec Merge branch 'dev_zyx' into dev
chenzhi a9bc64a4b2 优化统计逻辑