Commit Graph

2401 Commits (ff2481cdc415061e6ff9c3ef877f7ff3801b1dff)
 

Author SHA1 Message Date
Your Name f9eac7138f OA获取信息
ELF e0d542b5f6 解决冲突
“用lww 63d99584ed Merge branch 'dev' into dev_lww
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote
ELF d2190481b5 Merge branch 'dev'
ELF 2f4cd4c101 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF f056143dee 修改bug
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角色聚合
Your Name 90105716d5 OA获取信息修改
Your Name 93bbc57ef2 OA获取信息修改
Your Name 94480951cb OA获取信息修改
“用lww 631a635dfe 还原新版本
“用lww 4edd0bac4a 修改
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
“用lww d5998e722e 官网-底部间距调整
ELF f0b16b98db Merge branch 'dev'
zyx 9e9d742275 导出添加引号
ELF b1328c820e Merge branch 'dev'
zhengchanglong 943564f82d Merge branch 'dev_zyx' into dev
zyx d5a90238ec 导出加大默认内存
chenxiaojun 02d862cb7a 推广后台->安全密码--样式调整
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz 68df391d9c upt
ELF ec994ca6a2 Merge branch 'dev'
ELF d79da20c28 Merge branch 'hotfix/media' into dev
ELF 07ecf8a25e Merge branch 'hotfix/media'
ELF 3d88a82794 回滚官网
zhengchanglong 0223ecb125 Merge branch 'dev_zyx' into dev
zyx 35e1b2631a 导出添加游戏订单号
zhengchanglong 945ea1173a Merge branch 'dev_zyx' into dev
zyx a307bf343e 游戏详情查看导出,按日期分成多个sheet
ELF 8c81b195e1 Merge branch 'dev'
ELF 1e1eb99b85 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 387e019db7 删除无用代码
“用lww 322aed6379 官网-游戏详情
“用lww fb99dc3389 官网
chenxiaojun 3f7fd8c3c7 推广后台->结算明细|分成比例--样式调整
zhengchanglong 4dd2ab92f3 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev
“用lww 320ebf1b6e 新增分支dev_lww
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菜单添加平台选型
ELF 38c2efdd08 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote