877 Commits (9843b5d885f54041f0202ca608a6b285106af5da)

Author SHA1 Message Date
yulingwei 9f156f7be4 ltv优化 5 years ago
zhengchanglong 2cb7d9bdfd 扶持资源改成测试资源 5 years ago
chenxiaojun 8fd8ae006a 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun f2fc739db2 管理后台>推广员管理>公会分成管理--新增 5 years ago
chenxiaojun bd8c4331bd 管理后台>推广员管理>公会分成管理--新增 5 years ago
chenxiaojun 8261512ba3 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun f032257838 推广平台>数据管理>充值玩家--更新 5 years ago
zhanglingsheng f3dd820ca1 Merge branch 'release-1.0.0' into dev 5 years ago
zhanglingsheng 2a5dccdab8 游戏充值预下单 5 years ago
chenxiaojun f16949935f 推广平台>数据管理>充值玩家--更新 5 years ago
zhengyongxing 449a16ab13 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 5040b78473 登录日志修改 5 years ago
zhanglingsheng 33c3fd1d0d 游戏联动查询 5 years ago
zhanglingsheng 31af192402 解决冲突 5 years ago
chenxiaojun 61bfbd00cc 公会分成管理 5 years ago
zhanglingsheng 6ddf42181c 游戏查询联动 5 years ago
zhanglingsheng 8f75d0f450 游戏 5 years ago
zhanglingsheng 24d47089dd 游戏预充值 5 years ago
zhanglingsheng 0e0f603d13 游戏充值预下单 5 years ago
chenxiaojun 9c4f1e5c4e 推广平台>数据管理>充值玩家--检索bug修复 5 years ago
zhanglingsheng 5ff5b5e346 Merge branch 'release-1.0.0' into dev 5 years ago
chenzhi 5257528b87 Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission 5 years ago
chenzhi da79ff4441 优化角色权限2 5 years ago
zhengyongxing deaeed6027 数据授权修改内容提交 5 years ago
zhengyongxing 6dc8366018 数据授权修改内容提交 5 years ago
zhanglingsheng a15e62988b 游戏预充值-导出 5 years ago
chenzhi 1623f3ae65 优化多会长统计1 5 years ago
zhanglingsheng 621776246a SDK菜单添加隐藏 5 years ago
zhanglingsheng eaf1cb3f17 游戏区服联动修改 5 years ago
liuweiwen 6b1bbe4c20 数据授权修改 5 years ago
zhanglingsheng 47628f2981 游戏充值预下单 5 years ago
zhanglingsheng fb425d3e91 游戏充值预下单 5 years ago
zhengyongxing 21412df14e Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission 5 years ago
zhengyongxing 3aa3c3f66b 数据授权修改 5 years ago
zhanglingsheng e949a4a60b 游戏充值预下单 5 years ago
zhanglingsheng 95f7acd6ff 游戏充值预下单 5 years ago
zhanglingsheng 65e1ddbd93 游戏充值预下单 5 years ago
zhengchanglong 732ba257ec 修改身份证加密显示方式 5 years ago
zhengchanglong f88a5c7f6e Merge branch 'dev' into release-1.0.0 5 years ago
zhengchanglong 8a241cceb8 修改身份证加密显示方式 5 years ago
liuweiwen de7d34576d 添加数据权限
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
5 years ago
liuweiwen 24e322c139 Merge remote-tracking branch 'origin/dev_permission' into dev_permission 5 years ago
liuweiwen 42ccd44de3 Merge branch 'dev_lww' into dev_permission
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/MendController.class.php
#	Application/Admin/Controller/PromoteController.class.php
#	Application/Admin/Model/MemberModel.class.php
5 years ago
zhengyongxing 2b336dd560 数据文件删除 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
liuweiwen 1212d3249e 添加数据权限
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
5 years ago
chenzhi ff6c70e380 合并cz 5 years ago
zhengchanglong 9490c7a40d Merge branch 'dev' into release-1.0.0 5 years ago
liuweiwen 42881595aa 获取当前管理员有权限查看所有推广员id 5 years ago
zhengchanglong 6851933966 新建分支 5 years ago
zhengyongxing d545c22c3b 数据管理功能提交 5 years ago
liuweiwen 166a868543 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
zhengyongxing 5df3a59df4 扶持发放添加导出功能 5 years ago
zhengyongxing 6f584f8323 数据权限功能提交 5 years ago
chenzhi c251867ba6 修改用户列表重复搜索区服不存在bug 5 years ago
chenxiaojun 7cfa9175da 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun b21ec3859f 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun d6b7bc811d 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
zhanglingsheng 5d01cb1ff5 游戏充值预下单 5 years ago
zhanglingsheng 6d2c4fc3a2 游戏充值预下单 5 years ago
zhengyongxing 7ec754e0eb Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng a5cc0f339f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 62502f0732 游戏充值预下单 5 years ago
zhengyongxing e6c45bc494 推广补链导出修改 5 years ago
zhengyongxing 6fbf14c9fe Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
zhengyongxing 24dab9158b 管理后台bug修改 5 years ago
zhanglingsheng 812532a52d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3a20c68117 游戏充值预下单修改 5 years ago
chenzhi db6131a135 暂存 5 years ago
zhengyongxing 46538019d4 管理后台新开发功能修改 5 years ago
zhengchanglong 6fa8392766 Merge branch 'master_zcl' into release-1.0.0 5 years ago
zhengchanglong ec0fb0d0b4 Merge branch 'master_zcl' into dev 5 years ago
zhengchanglong 65b5fc4a26 隐藏游戏充值列表部分字段 5 years ago
liuweiwen e30f2f9601 Merge branch 'dev' into dev_lww
# Conflicts:
#	Application/Admin/Controller/FileController.class.php
#	Application/Admin/Controller/GameController.class.php
#	Application/Admin/View/Game/edit.html
#	Application/Home/Controller/HomeController.class.php
#	Application/Home/View/default/Home/landingPage.html
#	Public/Home/css/index2.css
5 years ago
zhengchanglong 4e8abd5975 Merge branch 'master_zcl' into release-1.0.0
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
5 years ago
zhengchanglong 996b9bceac Merge branch 'master_zcl' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
5 years ago
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong 381fa8d633 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong ed584bfb2f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenzhi ab29dafffc 补链旧数据脚本 5 years ago
chenzhi 9df450f8cc 优化订单日期内多个推广员无法补链 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
zhengyongxing 8b2d04f986 管理后台新开发功能修改 5 years ago
zhengyongxing e2e685e8c3 管理后台新开发功能修改 5 years ago
chenzhi 60c7bdce34 新增补链时判断是否已结算 5 years ago
chenxiaojun 9d09913bd0 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 64eb3ce4cb 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun b27906d470 推广平台>数据管理>充值玩家--更新 5 years ago
chenzhi 1ccbd03a0f 超级签新增支付方式 5 years ago
zhanglingsheng cf7440e87e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng ad97083c9f 行为日志文案 5 years ago
chenzhi 0c62e80e67 优化总览表格高度 5 years ago
zhengyongxing f112364f63 超级签功能bug修改 5 years ago
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 1bf6adb6c7 优化用户列表默认时间 5 years ago
zhengyongxing 11177b895c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
liuweiwen 188abdcbdd 落地页视频置顶判断 5 years ago