Commit Graph

942 Commits (f642fb2c90994ec919130c3046ffa96b85794921)
 

Author SHA1 Message Date
Your Name f642fb2c90 游戏充值订单添加CP订单号字段
Your Name b54f73e4c2 OA获取信息
Your Name 31e90a9dee OA获取信息
Your Name f9eac7138f OA获取信息
Your Name 90105716d5 OA获取信息修改
Your Name 93bbc57ef2 OA获取信息修改
Your Name 94480951cb OA获取信息修改
zyx 9e9d742275 导出添加引号
zhengchanglong 943564f82d Merge branch 'dev_zyx' into dev
zyx d5a90238ec 导出加大默认内存
ELF d79da20c28 Merge branch 'hotfix/media' into dev
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'
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菜单添加平台选型
“用lww bde48df713 官网-商务合作
ELF e9be667b5a Merge branch 'dev'
zhengchanglong 561b183bec Merge branch 'dev_zyx' into dev
chenzhi a9bc64a4b2 优化统计逻辑
zhengchanglong 78e23d19b2 Merge branch 'dev_zyx' into dev
zyx 8fd435a324 月结统计,游戏查看名称修改
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev
zyx 4dfec50ba5 月结统计修改
“用lww 6dc6fecf6b Merge branch 'dev' into dev_lww
chenzhi 0ae24bf2cd 优化财务聚合接口2
“用lww 7549062127 新增分支dev_lww
chenzhi 58c405e914 优化财务聚合接口
ELF ae97711b26 Merge branch 'dev'
zhengchanglong 879accf9f5 Merge branch 'dev_zyx' into dev
zyx f44a11a915 月结统计提示语修改
zhengchanglong 78846c699f Merge branch 'dev_zyx' into dev
zyx 9539b38e86 月结统计提示语修改
zhengchanglong 3c3a13c068 Merge branch 'dev_zyx' into dev
zyx f0559c3576 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Admin/View/Finance/index.html
zyx cfa33d3e42 月结统计提示语修改
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev
zyx a850cfa048 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 71b2287647 测试资源日志管理修改
chenzhi f9397efebf 修改总流水统计方式
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Data/update.sql