902 Commits (12016f1b34256057290d647334e4f191dc8b292d)

Author SHA1 Message Date
zhengchanglong 943564f82d Merge branch 'dev_zyx' into dev 5 years ago
zyx d5a90238ec 导出加大默认内存 5 years ago
chenxiaojun 02d862cb7a 推广后台->安全密码--样式调整 5 years ago
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz 68df391d9c upt 5 years ago
ELF d79da20c28 Merge branch 'hotfix/media' into dev 5 years ago
ELF 3d88a82794 回滚官网 5 years ago
zhengchanglong 0223ecb125 Merge branch 'dev_zyx' into dev 5 years ago
zyx 35e1b2631a 导出添加游戏订单号 5 years ago
zhengchanglong 945ea1173a Merge branch 'dev_zyx' into dev 5 years ago
zyx a307bf343e 游戏详情查看导出,按日期分成多个sheet 5 years ago
ELF 1e1eb99b85 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 387e019db7 删除无用代码 5 years ago
chenxiaojun 3f7fd8c3c7 推广后台->结算明细|分成比例--样式调整 5 years ago
zhengchanglong 4dd2ab92f3 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev 5 years ago
“用lww 320ebf1b6e 新增分支dev_lww 5 years ago
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev 5 years ago
zyx 7e4aaf0a2e Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 266202c06b 游戏详情查看导出,按日期分成多个sheet 5 years ago
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name 51701a485d SDK菜单添加平台选型 5 years ago
ELF 38c2efdd08 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 08774a0954 完善添加推广员 5 years ago
“用lww bde48df713 官网-商务合作 5 years ago
chenxiaojun 0cd7206f24 推广后台->数据管理->每日概况--bug修复 5 years ago
chenxiaojun 9b65745ee5 推广后台->验证安全密码--更新 5 years ago
chenxiaojun 265aa20a60 推广后台->验证安全密码--更新 5 years ago
chenxiaojun b731b827e1 推广后台->验证安全密码--更新 5 years ago
chenxiaojun 43eaaf67c6 推广后台->验证安全密码--更新 5 years ago
chenxiaojun f5d6bd27ab 推广后台->验证安全密码--更新 5 years ago
chenxiaojun 03cbc66d92 推广后台->验证安全密码--更新 5 years ago
chenxiaojun 1561e71977 推广后台->验证安全密码--更新 5 years ago
zyx 602e53e82f 合并分支dev_zyx财务部分的代码 5 years ago
chenxiaojun 8ae754f74a 推广后台->财务管理->结算明细--更新 5 years ago
ELF 71feea26fb 修改bug 5 years ago
ELF 89b243930d 落地页下载页优化 5 years ago
zhengchanglong 561b183bec Merge branch 'dev_zyx' into dev 5 years ago
chenzhi a9bc64a4b2 优化统计逻辑 5 years ago
zhengchanglong 78e23d19b2 Merge branch 'dev_zyx' into dev 5 years ago
zyx 8fd435a324 月结统计,游戏查看名称修改 5 years ago
chenxiaojun a32565e2e1 推广后台->数据管理->数据汇总|每日概况--更新 5 years ago
chenxiaojun 7220247ecd 推广后台->数据管理->数据汇总|每日概况--更新 5 years ago
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev 5 years ago
zyx 4dfec50ba5 月结统计修改 5 years ago
chenxiaojun 43603cf493 推广后台->数据管理->数据汇总--更新 5 years ago
chenzhi 0ae24bf2cd 优化财务聚合接口2 5 years ago
chenzhi 58c405e914 优化财务聚合接口 5 years ago
ELF c3502c6120 打包添加ios13兼容 5 years ago
chenzhi 0df9045e67 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi f54305911c 优化api暂存 5 years ago
chenxiaojun 3e2d027910 推广后台->财务管理->结算明细--更新 5 years ago
chenxiaojun fba89ccb48 推广后台->财务管理->结算明细--更新 5 years ago
chenxiaojun 1d6ce31515 推广后台->财务管理->结算明细--更新 5 years ago
chenxiaojun 30aff2bd38 推广后台->财务管理->新增->结算明细 5 years ago
ELF dbf113d9d4 修改bug 5 years ago
ELF 6c6b3b54aa Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 7547e867bb 三级变四级修改 5 years ago
ELF fc89281a48 3级变4级修改 5 years ago
chenzhi eacdea6f9b 暂存修改 5 years ago
chenzhi a9b7b22a4b Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 81192f36c8 xiufu 5 years ago
sunke 372ec046d0 安全中心 5 years ago
zyx 3d8ed52daf 推广后台首页条件修改 5 years ago
chenzhi 6c45b4dd3f 修改获取下级函数 5 years ago
ELF ae44fc79bd 修改 5 years ago
zhengchanglong 879accf9f5 Merge branch 'dev_zyx' into dev 5 years ago
zyx f44a11a915 月结统计提示语修改 5 years ago
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 18be299b4c 同步dev 5 years ago
zhengchanglong 78846c699f Merge branch 'dev_zyx' into dev 5 years ago
zyx 9539b38e86 月结统计提示语修改 5 years ago
jbrazz 48b1cdf66f upt 5 years ago
zhengchanglong 3c3a13c068 Merge branch 'dev_zyx' into dev 5 years ago
zyx f0559c3576 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Admin/View/Finance/index.html
5 years ago
zyx cfa33d3e42 月结统计提示语修改 5 years ago
jbrazz a8125bf377 upt 5 years ago
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev 5 years ago
zyx a850cfa048 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 71b2287647 测试资源日志管理修改 5 years ago
chenzhi f9397efebf 修改总流水统计方式 5 years ago
chenxiaojun b6a62e2df1 推广后台->数据管理->每日概况 -- 更新 5 years ago
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Data/update.sql
5 years ago
zyx 5a7432ef40 月结统计新增平台比收入字段,将平台币流水改为平台币支出 5 years ago
chenzhi c8da11a12e 新增平台币流水充值 5 years ago
chenxiaojun 81ed43afdd 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
zyx b6080180ab 测试资源bug修正 5 years ago
chenzhi b4c9f60ac9 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
elf@home fc1cef9ec1 修改落地页/下载页 5 years ago
ELF b4168a23f1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF edc40b8a1b ss 5 years ago
chenzhi 8212b4ecaf 4级推广申请资源修正 5 years ago
chenzhi 498de9ab75 同步dev 5 years ago
chenzhi ab2252375d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi c8fb1bb207 修改 5 years ago
chenxiaojun 681c401686 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
chenxiaojun 42d330bbc4 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
chenxiaojun b1b10645fc 推广后台->数据管理->每日概况|数据汇总 -- 更新 5 years ago
ELF 689cc08b69 修改 5 years ago
zhengchanglong 5b93736468 Merge branch 'dev_zyx' into dev 5 years ago