176 Commits (6dbfd09e917f73b929096346532ccfb669d49043)

Author SHA1 Message Date
zhanglingsheng 7ba7de46a3 游戏--添加支付方式渠道配置 5 years ago
zhanglingsheng 669baefe5e 游戏--添加支付方式渠道配置 5 years ago
ELF 48b18db141 修改落地页 5 years ago
ELF 6e55b657a4 修改落地页 5 years ago
tping 964eea79e5 1, 平台币补单
2,repair_pay表
5 years ago
ELF d72b129596 解决冲突 5 years ago
ELF d0077d1a85 修改bugt 5 years ago
zhanglingsheng 93123b3b95 订单记录 5 years ago
ELF 88c1cdcd1b 解决冲突 5 years ago
zhengchanglong 616c7f583f Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Data/update.sql
5 years ago
ELF 8d934c8d88 修改 5 years ago
liuweiwen 8c7107ddd2 更新sql语句 5 years ago
chenzhi 0ef4241570 合并statistcs 5 years ago
tping 64543b10da -- user_play 增加create_time 5 years ago
ELF 12fd7ac4e9 修改数据库 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
liuweiwen 8fb6ea99bb Merge branch 'release-1.0.0' into dev_permission 5 years ago
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新 5 years ago
liuweiwen 4a7c9d7230 更新sql 5 years ago
chenxiaojun 5034cb863b 管理后台>推广员管理>公会分成管理--更新 5 years ago
tpingzhang 8d624a0395 pay_info 增加索引 5 years ago
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
5 years ago
zhengyongxing 4473b20016 数据权限sql提交 5 years ago
zhengchanglong 7c7ec4fc1d Merge branch 'dev_permission' into release-1.0.0
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
5 years ago
chenxiaojun 4c05a682b3 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 14d4c71a7f 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 3e439715c1 管理后台>推广员管理>公会分成管理--更新 5 years ago
ELF 1e8735f173 修改文件 5 years ago
zhanglingsheng c25f3b48fa 超级签统计 5 years ago
zhanglingsheng 09ba38fc79 超级签统计 5 years ago
liuweiwen 5d6716b239 游戏统计 5 years ago
chenxiaojun 61bfbd00cc 公会分成管理 5 years ago
liuweiwen 7d01bc6ff5 sql语句更新 5 years ago
tpingzhang f4effc746d 默认值处理 5 years ago
chenzhi dc1b462718 新增两统计表 5 years ago
tpingzhang cbf74bca5d 苹果内购 5 years ago
zhengyongxing 4a5a6a90d0 Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission
 Conflicts:
	Data/update.sql
5 years ago
chenzhi ff6c70e380 合并cz 5 years ago
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
tpingzhang dccb94c779 tab_pay_info 5 years ago
zhengyongxing b2d1c27054 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
5 years ago
chenxiaojun 9d09913bd0 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 0a7973ae3c 推广平台>数据管理>充值玩家--更新 5 years ago
zhanglingsheng 8a1a65c771 sql添加行为日志菜单 5 years ago
zhanglingsheng 701bb6a818 sql添加行为日志菜单 5 years ago
chenzhi 1ccbd03a0f 超级签新增支付方式 5 years ago
zhanglingsheng 387fe5c007 支付信息修改字段 5 years ago
zhengyongxing f225cff461 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
5 years ago
ELF 991861e488 解决冲突 5 years ago
ELF 289b40329f 添加换绑时金额 5 years ago