Commit Graph

3587 Commits (9152a3ef59abd0dfb2756a1eede45128de1f19cd)
 

Author SHA1 Message Date
zhengyongxing 2b335ec910 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 45ea27fd1f 市场结算列表删除操作
chenzhi cba3fc898c 新增查看
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
liuweiwen 394a3e4bb5 cp/工会对账系统
zhengyongxing 6bda9fe842 市场结算管理代码编辑完善
zhengyongxing ad901c31db 市场结算管理代码编辑完善
chenxiaojun 7550bafdf7 充值玩家--更新
zhengyongxing 99f23254ed 市场结算管理代码提交
zhengyongxing 68312cc277 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing 71b1498c71 市场结算管理代码提交
chenzhi 25240227e4 新增编辑
chenxiaojun 82784f9da9 推广提现--更新
yulingwei 9910485523 修改
yulingwei 1a6f4f2178 sql
chenxiaojun 9b47108400 推广提现--更新
chenxiaojun 843c54ced5 推广提现--更新
yulingwei 7ea2a465bf 修复问题
chenzhi 72405e45f5 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ea6d820408 优化页面显示
chenxiaojun 4286817dea 推广提现--更新
zhengchanglong 066fe46064 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong eb114b33b3 游戏分成比例设定体验优化
zhengyongxing dddd640f9f 结算单管理列表修改
chenzhi d484c96744 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi cccbc3bfa8 新增cp结算单判断是否已经有交叉时间
zhengchanglong b34eec98ee 游戏分成比例设定体验优化
chenxiaojun dcea6b7e05 推广提现--更新
zhengchanglong 5ac23b6a5b Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong de8386c0cb 游戏用户锁定备注显示
chenzhi 0934cd472a 新增cp结算单到列表中
zhengyongxing 2154899a6a Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
zhengyongxing f87026a32c 结算单管理生成下游订单
chenzhi cda9d0c1a8 合并
chenzhi cd427a9409 新增添加cp上游对账单
zhengchanglong 87096e180e 游戏用户锁定备注显示
zhengchanglong 93fe724c15 游戏用户锁定备注显示
zhengchanglong 941978bb07 【游戏】-【合作方管理】,联系人改为必填项,必填项前面加红色※号
zhengchanglong e4d88b6405 添加更新SQL语句
chenxiaojun 08dd26f942 推广提现--更新
zhengchanglong e914fde68d 玩家列表账号锁定添加备注
chenxiaojun cf0680eddf 开服预告正序显示
yulingwei 56b0216ff0 修改问题
chenxiaojun 0c0d59dd43 财务管理--更新
chenxiaojun ad80923bed 更新
chenxiaojun f244b42ab7 推广结算--更新
yulingwei ed9ddd2d67 修复检索问题
yulingwei e3f0a24e43 弹窗推广后台更新
zhengchanglong 326d9e5a12 管理后台-游戏-游戏编辑:参数配置-新增CP游戏分成比例
zhengyongxing ea140a430f 导出模板方法上传