105 Commits (4d1cfb36ec4d5a4bc7106fd93020ce609518fb46)

Author SHA1 Message Date
chenzhi f0d298c042 公会统计新增团体类型 5 years ago
zhengyongxing be932b1ebd 奖罚管理bug修改 5 years ago
yulingwei e26f517df1 冲突解决 5 years ago
yulingwei 3c44d5d200 upt 5 years ago
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen a1c3ad8fb3 数据展示权限 5 years ago
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Data/update.sql
5 years ago
zhengyongxing 955a1917b3 生成个人结算单的功能完成 5 years ago
zhengchanglong cb5cef678d Merge branch 'hotfix/test_order' into release 5 years ago
zhengyongxing 56ecea6998 下游个人结算单生成代码上传 5 years ago
zhengchanglong 254d29f3f2 测试订单录入 5 years ago
liuweiwen dfd198e9b7 对账系统增加奖罚数据 5 years ago
zhengyongxing 77463c7e1d 市场结算管理上游流水符号修正 5 years ago
liuweiwen 51d2d91671 验证手机号码格式修改 5 years ago
chenzhi 39c43c1bee 优化游戏分成比例获取函数备注 5 years ago
zyx 414d36c373 cp分成比例方法修正 5 years ago
zyx 782de31ca8 cp分成比例方法添加 5 years ago
zyx f58f05d00d cp分成比例方法修正 5 years ago
zyx 4be5b1ba2c cp分成比例方法添加 5 years ago
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
chenxiaojun 258e10c9d1 结算管理--更新 5 years ago
liuweiwen 6f7dcb9ca5 修改上下游对账单导出文件名 5 years ago
zhengyongxing c09c3a591e 结算单bug修正 5 years ago
zhengyongxing 7f99dafb2c 市场结算管理 上游结算流水bug修正 5 years ago
liuweiwen 1e4b7f69d5 cp/工会对账系统 5 years ago
liuweiwen 21ee77609c cp/工会对账系统 5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
zhengyongxing ea140a430f 导出模板方法上传 5 years ago
zhengyongxing ba158e6b9a 市场结算管理上传 5 years ago
liuweiwen 50320be1d2 新增需求:管理后台-》推广公会归属管理,列表,新增,编辑,审批 5 years ago
zhengyongxing 89883d2005 新增市场结算管理 5 years ago
zhengyongxing 13f5128dd8 支付渠道统计导出bug修正,游戏充值充值方式检索修正 5 years ago
chenzhi 82afa60d12 优化玩家列表导出2 5 years ago
chenzhi d3ccc3bb5b 暂存 5 years ago
chenzhi 9b7f3d1104 优化csv导出默认为不转码 5 years ago
chenzhi 9d89be4527 优化公司游戏名游戏类型关系检索 5 years ago
chenzhi cf89e73281 优化csv导出函数 5 years ago
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev 5 years ago
chenzhi 629c733742 删除函数重复问题 5 years ago
chenzhi 0ef4241570 合并statistcs 5 years ago
liuweiwen 2e818c04f8 登录记录搜索 5 years ago
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev 5 years ago
zhengyongxing b8859837fb 登录数据权限数据 5 years ago
liuweiwen 2096c22826 注释 5 years ago
liuweiwen 86dd4a2952 【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录
改为展示这个会长及其所属推广员的登录记录
5 years ago
zhengchanglong 4968ace29d Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php
5 years ago
zhengchanglong dbaf93b630 非管理员数据加密显示 5 years ago
chenzhi c5dc3b4f22 优化会长统计导出1 5 years ago
zhengchanglong 39b6e98f3b Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
#	Data/update.sql
5 years ago
chenzhi b743cd73e1 新增导出csv函数 5 years ago