Commit Graph

139 Commits (990c62b06a5dfd39ae23e386e52a41573ede3b97)

Author SHA1 Message Date
廖金灵 bab7fec46d Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
chenzhi c45ca2942d 优化设备名称函数
chenzhi 6f7e0de83d 优化平台币设备,名称
chenzhi f0a19cfc99 优化设备名称为字典
chenzhi 9064fc7c58 游戏统计 游戏名称不含设备类型优化
chenzhi 55d49e8b4b 优化推广公会列表导出
chenzhi 1761d37b5c 推广公会列表 适配新内外团规则
chenzhi ccda6e0b39 开启操作日志
ELF 9e82faf6f3 关闭后台操作日志
chenzhi 0344471659 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi cfbbf8e76b 优化默认公司名称为海南万盟天下科技
zhengyongxing c6eef5124d 测试资源修改
zhengyongxing 800680c6c0 测试资源申请审核验证增加区服
zhengyongxing d6db0d3789 测试资源根据可用余额进行验证
zhengyongxing f840a59ce2 日志操作bug修复
chenzhi 0b8cf1d3ee Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
chenzhi 44f44d0c4a 操作日志函数修改
zhengyongxing 3b73c1d340 操作日志bug修正
liuweiwen 010080e32b Merge branch 'feature/yibao_company' into release
liuweiwen f35c7bdc77 实时充值查询增加易宝支付
liuweiwen 969bf4dc8a Merge branch 'feature/yibao_company' into release
# Conflicts:
#	Application/Admin/Common/extend.php
liuweiwen 5d596094a6 增加易宝支付
liuweiwen 3b415976eb 增加易宝支付
zhanglingsheng c6e1493035 易宝支付
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
zhanglingsheng 95f93bdc04 配置添加易宝支付
zhanglingsheng ee3db4d472 获取支付配置添加易宝支付
zhengyongxing 3c628fa1c6 统计日志添加
chenzhi dc171af556 分控新增与解除操作日志
chenzhi 97ff3baaff 优化操作日志下载
chenzhi 7141e3752e 优化操作日志基函数
zhengyongxing 3f4f39e238 封装时间函数
zhengyongxing 756b3b9975 操作日志公用函数移到extend.php中
liuweiwen 02920aab8a 资源审核配置列表、新增、编辑、删除、锁定、解锁
chenzhi f0d298c042 公会统计新增团体类型
zhengyongxing be932b1ebd 奖罚管理bug修改
yulingwei e26f517df1 冲突解决
yulingwei 3c44d5d200 upt
zhengchanglong 99f62f3c14 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
liuweiwen a1c3ad8fb3 数据展示权限
zhengyongxing 0cbd58862e Merge branch 'release' of 47.111.118.107:wmtx/platform into release
 Conflicts:
	Data/update.sql
zhengyongxing 955a1917b3 生成个人结算单的功能完成
zhengchanglong cb5cef678d Merge branch 'hotfix/test_order' into release
zhengyongxing 56ecea6998 下游个人结算单生成代码上传
zhengchanglong 254d29f3f2 测试订单录入
liuweiwen dfd198e9b7 对账系统增加奖罚数据
zhengyongxing 77463c7e1d 市场结算管理上游流水符号修正
liuweiwen 51d2d91671 验证手机号码格式修改
chenzhi 39c43c1bee 优化游戏分成比例获取函数备注
zyx 414d36c373 cp分成比例方法修正