Commit Graph

3817 Commits (0d45be780ffb83d4128acc6737ee26697198c083)
 

Author SHA1 Message Date
chenxiaojun bfc93e0626 公会分成管理--更新
chenxiaojun d995675829 更新
chenxiaojun 1594500eca 资质认证--更新
zhengyongxing 547b0439e3 市场结算添加编辑添加户名
chenzhi 1275c740d5 新增cp对账单删除
zhengyongxing da420ceb5c 市场结算添加编辑添加户名
zhengyongxing b74ac306ae 市场结算添加编辑添加户名
chenzhi 1bb038db4e 优化查看2
chenzhi 89d21c6218 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi f06cddc093 优化查看
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 c42e0be4cd 更新
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 4a53915c22 更新
chenxiaojun 82784f9da9 推广提现--更新
sunke 4c449624f8 增加条件过滤
sunke 4c4f46ed4b 添加条件 过滤
yulingwei 34debb1287 Merge branch 'feature/pop_rules' into dev
yulingwei 9910485523 修改
sunke c5febf0b9a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
yulingwei 84053802e5 新增sql
yulingwei 9fe9a47b6f Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
yulingwei 1a6f4f2178 sql
sunke 4f55253083 过滤规则
chenxiaojun 56956d90de 更新
chenxiaojun 9b47108400 推广提现--更新
sunke 0033dd84b5 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
sunke 10fb1aec73 过滤规则
sunke 5cd760bb7a Merge branch 'dev' of 47.111.118.107:wmtx/platform into feature/newFunc
chenxiaojun a6b9e5e39f 更新
chenxiaojun 843c54ced5 推广提现--更新
yulingwei b5d71ae215 Merge branch 'feature/pop_rules' into dev
yulingwei 7ea2a465bf 修复问题
chenzhi 72405e45f5 Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
chenzhi ea6d820408 优化页面显示
chenxiaojun 009842c218 更新
chenxiaojun 4286817dea 推广提现--更新
zhengchanglong 9952029e6c Merge branch 'feature/group_type' into dev
zhengchanglong 066fe46064 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
zhengchanglong eb114b33b3 游戏分成比例设定体验优化