Commit Graph

357 Commits (e5c3ee02ae8493913f8e99efa99854b530df7053)

Author SHA1 Message Date
sunke d2d211737f bug
sunke eac235d498 身份认证后台
zhengchanglong d95fd1b1a7 Merge branch 'dev_zcl' into dev
zhanglingsheng d0a0068039 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 94cc0bacbf SDK菜单链接修改
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页
zhanglingsheng 21b02ca200 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng f074ce853b sdk菜单配置修改
yulingwei 82bdfadb7d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 2e0a8d2ad0 更新统计数据
zhanglingsheng 5b3c01e1ba Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3453de757f sdk菜单配置修改
chenxiaojun 5e3cc42bc1 管理后台->推广员->推广员编辑--二级密码名词解释更改
chenxiaojun cc572ca66e 管理后台->推广员->推广员编辑--二级密码名词解释更改
zhengyongxing 49cb4c86eb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
 Conflicts:
	Application/Home/View/default/Finance/withdrawRecord.html
zhengyongxing 97b9a06e69 推广后台bug修正
chenxiaojun f7d0109ee7 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun 5caf75afb9 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun 8ac33bb9e4 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun fd53997094 管理后台->充值->平台币订单->平台币回收--更新
zhengchanglong 0b8dfcdc89 管理后台时时实时注册查询修改
chenxiaojun e96bd42ef6 管理后台->游戏--去除CP分成比例同步
chenxiaojun 25b319f87c 管理后台->游戏--去除CP分成比例同步
chenxiaojun 6ad8277aa0 管理后台--更新
chenxiaojun 2e7ecfa53c 管理后台--更新
sunke ee8a954566 查看消费记录滚动
yulingwei a7f6d8b7a4 upt
elf@home 06486d458c 修改bug
elf@home 1036589f3b 修改代码
zhengchanglong ab46f9f6ec Merge branch 'feature/promote' into dev
chenxiaojun a84ea0e679 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 55fe6a2c7d 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 638ceba6cc 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 9075730d83 管理后台->游戏订单->游戏充值--更新
chenxiaojun f473c0abc1 管理后台->游戏订单->游戏充值--列表样式调整
chenxiaojun 3fbdc9daa0 管理后台->游戏订单->游戏充值--sql优化
chenxiaojun 83e8427c8b cs
ELF b0b0056c43 修改bug
ELF e942f378c6 修改bug
zhanglingsheng 656e9b7231 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng fb0808445f 悬浮球加类型
sunke 1f34a3a0ce 平台币明细,sdk菜单图片上传
yulingwei 44954031bf upt
yulingwei 0d258c1d8d upt
ELF e2d75ec2c6 修改推广后台首页
yulingwei 5a2e6c2b63 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 6ea4c72416 修改部分导出报表问题
ELF 905efbfd9a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote
ELF 9fde84f6ca Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote