478 Commits (fa9dc518d58742d6abda67936446655faa9e4eb8)

Author SHA1 Message Date
yulingwei dfe52865bd upt 5 years ago
zhengyongxing 0b7327bc4e Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen 7da5e25e16 合作方 5 years ago
yulingwei 469a037b0f merge 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
chenzhi da2e3a769c 推广列表查看 5 years ago
liuweiwen ada2913cdc 奖罚记录管理根据公司类型搜索 5 years ago
chenzhi 6a612565c6 扩展推广公司添加 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
chenzhi e497fb16ee 移除新增推广公司结构 5 years ago
chenzhi 52971b378f 新增推广公司表结构 5 years ago
zhengchanglong 9b43cc90b4 Merge branch 'hotfix/test_order' into release
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong bdbbeab1a0 添加测试订单录入表 5 years ago
yulingwei e35f20ee70 游戏预警 5 years ago
ELF c95f771ba0 解决冲突 5 years ago
ELF 423b4ae77b 解决冲突 5 years ago
sunke f65ad73acf sql公司录入 5 years ago
sunke cec446b5ab sql 5 years ago
ELF bbb31890f6 未收押金会长禁用落地页/下载页 5 years ago
ELF ed25d54dc8 解决冲突 5 years ago
ELF 501b8099d4 解决冲突 5 years ago
chenxiaojun 2c52bccaf7 管理后台>推广员>结算管理>推广提现>自动审核管理--更新 5 years ago
yulingwei a10a21c12b update sql remark 5 years ago
liaojinling e596d11cee 会长押金 5 years ago
jbRotk a6b1194be0 解决冲突 5 years ago
jbRotk 5d315d4182 添加工会类型 5 years ago
zhengchanglong 8b33a52cd0 修改奖罚记录字段顺序 5 years ago
jbRotk 2e4f1edb5a 修改sql 5 years ago
liuweiwen eb30abd06a 更新sql语句 5 years ago
liuweiwen b444a3546b Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen c92fa425d2 内部公司信息管理 5 years ago
jbRotk c968e54cf8 解决冲突 5 years ago
jbRotk 94afe49b0c upt 5 years ago
liaojinling d789a175f8 推广员/组长添加备注 5 years ago
jbRotk 35b6d25ebc upt 5 years ago
chenzhi aba7ed22d1 财务汇总分类脚本-按收入类型 5 years ago
chenxiaojun f1b454627e 管理后台更新 5 years ago
chenxiaojun a8008fbe05 管理后台>推广员>结算管理>公会分成管理--规则修改 5 years ago
chenxiaojun 73f1055303 管理后台>推广员>结算管理>推广提现--增加自动审核功能 5 years ago
zhengchanglong 72d222a64a CP分成比例修改 5 years ago
chenxiaojun 10665cc869 管理后台>推广员>结算管理>公会分成管理--更新 5 years ago
sk 4ce64d43aa 公司录入sql语句 5 years ago
ELF e8a0975981 解决冲突 5 years ago
ELF 6993d164a3 解决冲突 5 years ago
sunke 6bdc31dfa1 会长权限sql 5 years ago
ELF d3a3b8cdb7 修改 5 years ago
yulingwei f0109e9554 合并请求 5 years ago
yulingwei 7b2a60147a upt 5 years ago
sunke d2b7e91a64 推广配置 5 years ago
ELF 0d45be780f 解决冲突 5 years ago
chenxiaojun 5a75ea406a 更新 5 years ago
chenxiaojun a643e88ffb 财务管理--更新 5 years ago
chenxiaojun b367b4a8d3 公会分成管理--更新 5 years ago
chenxiaojun 66a238dfd4 结算管理--更新 5 years ago
chenxiaojun 6e05546db6 公会分成管理--更新 5 years ago
yulingwei 23f2334e45 新增充值权限查看 5 years ago
ELF f0acbc1c24 充值信息根据会长权限显示 5 years ago
chenxiaojun 2e1742c759 推广提现--更新 5 years ago
sunke 9152a3ef59 推广配置导入功能 5 years ago
ELF 3ab162ae65 修改sql 5 years ago
ELF c4934613ae 解决冲突 5 years ago
ELF b0bc4c0496 解决冲突 5 years ago
ELF 0f44d9e95c 解决冲突 5 years ago
chenxiaojun 02ccf125dc 公会分成管理--更新 5 years ago
chenxiaojun 365a276b95 公会分成管理--更新 5 years ago
zhengchanglong e4b07360ad 更新SQL语句 5 years ago
zhengyongxing e637c90021 Merge branch 'feature/group_type' into dev 5 years ago
liuweiwen 0694b457bd 更新sql 5 years ago
chenzhi 96466100bb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
liuweiwen 4e6555d7fa 更新sql 5 years ago
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Data/update.sql
5 years ago
liuweiwen fc5db0b298 Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
# Conflicts:
#	Application/Admin/Controller/AjaxController.class.php
#	Data/update.sql
5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
yulingwei 84053802e5 新增sql 5 years ago
yulingwei 1a6f4f2178 sql 5 years ago
zhengchanglong 89d9b79930 Merge branch 'feature/group_type' into dev 5 years ago
chenzhi cda9d0c1a8 合并 5 years ago
chenzhi cd427a9409 新增添加cp上游对账单 5 years ago
zhengchanglong f8b0d74553 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong e4d88b6405 添加更新SQL语句 5 years ago
chenxiaojun 114cb2f7a5 更新 5 years ago
chenxiaojun f244b42ab7 推广结算--更新 5 years ago
chenzhi 377bdaee72 合并gt 5 years ago
liuweiwen 50320be1d2 新增需求:管理后台-》推广公会归属管理,列表,新增,编辑,审批 5 years ago
chenzhi 5326ef28db 合并 5 years ago
chenzhi 94243a5ea6 修改update冲突 5 years ago
liuweiwen d1c60ed153 新增表sql 5 years ago
chenxiaojun f2e0cec5aa 更新 5 years ago
chenxiaojun 0927417ce9 推广结算--更新 5 years ago
chenzhi 0039431ccb Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev 5 years ago
liuweiwen fa3adf2e0b 新增合作方时,新增录入内容
新增联系人,联系电话,邮寄地址。公司税号,收款方名称,
银行账号,开户行
5 years ago
chenxiaojun c3bd0e5a2b 渠道结算 5 years ago
chenxiaojun 631c23568d 上传汇款证明--调整 5 years ago
chenxiaojun 90eed6f5ca 结算管理--更新 5 years ago
chenxiaojun 8b7d592340 结算管理--更新 5 years ago
chenxiaojun c074b5fb86 结算管理--更新 5 years ago
liuweiwen 1c8f0d4464 更新sql 5 years ago
chenxiaojun 0baf97f717 会长提现--更新 5 years ago
liuweiwen c3a9282147 新增工会关系、工会归属字段 5 years ago
chenxiaojun e884214546 会长提现|公会分成管理--更新 5 years ago
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
zhengyongxing c1b446ba9a 管理后台新开发功能修改 5 years ago
zhengyongxing f112364f63 超级签功能bug修改 5 years ago
tpingzhang 46dda0848f 合服 用户行为 5 years ago
liuweiwen 48ae252b4e 游戏表增加字段视频是否置顶 5 years ago
ELF c61a3e200a 解决冲突 5 years ago
ELF 6f7a930c25 修改数据库 5 years ago
liuweiwen c31ae44f79 落地页去掉App购买 5 years ago
liuweiwen aff492b470 超级签新增需求-》后台增加超级签级签状态,手机端验证状态是否可下载与显示 5 years ago
liuweiwen d690c0e4ab 新增字段 5 years ago
chenzhi 7ba60cffdd 优化模型 5 years ago
chenzhi 25cb177aea 新增游戏区服开服预告 5 years ago
zhengchanglong 28ae254ebd SQL 语句更新 5 years ago
ELF 3e7382542d 打包区分ios新旧包 5 years ago
zhanglingsheng 0886dfc5d0 添加虚拟注册sql字段 5 years ago
yulingwei fa9d40f87a 新增风控标识 5 years ago
chenzhi 9e9cff0ba3 新增切分时间 5 years ago
ELF 128c11f5b8 修改 5 years ago
ELF bdd4e8ed81 修改sql 5 years ago
zhanglingsheng 8c31930ca9 sql修改 5 years ago
zhanglingsheng 2a46b5f783 sql-sdk菜单配置 5 years ago
zhanglingsheng 0e8bec9d36 sql-sdk菜单配置 5 years ago
chenxiaojun d5bc6be41e 玩家角色数据统计表更新 5 years ago
chenxiaojun ee095e3068 推广平台->游戏管理->充值玩家--调整 5 years ago
chenxiaojun 774196dde5 推广平台->游戏管理->充值玩家--调整 自动脚本->玩家角色充值数据统计--调整 5 years ago
chenxiaojun 46f1ac0807 推广平台->游戏管理->充值玩家--调整
自动脚本->玩家角色充值数据统计--调整
5 years ago
zhanglingsheng c4e2d0a245 推广员OA关联 5 years ago
chenxiaojun 57709068fa 推广平台->财务管理->提现记录--添加撤销提现 5 years ago
chenxiaojun ca2935763b 推广平台->财务管理->提现记录--添加撤销提现 5 years ago
chenxiaojun 5fcad13fce 根据时间统计玩家充值 5 years ago
chenxiaojun 2123b29479 根据时间统计玩家充值 5 years ago
zhanglingsheng 75b3b6899d 添加身份证认证信息数据库 5 years ago
zhanglingsheng 0239a5f8e4 添加身份证认证信息数据库 5 years ago
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
5 years ago
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新 5 years ago
chenxiaojun 49270427ee 推广平台->数据汇总->充值玩家--更新 5 years ago
zhengchanglong dfca90000d SQL 修改 5 years ago
zhengchanglong 053e1a968e SQL 修改 5 years ago
zhengchanglong 36c4e476ea Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong 3f869ccb2e Merge branch 'dev-cz' into dev
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun be1fe5418b 提现订单 添加索引 5 years ago
chenzhi 2a417c2746 123 5 years ago
zhengchanglong 849e4febce SQL 修改 5 years ago
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing b96a6f09b1 合并代码 5 years ago
zhengchanglong b59ca4b636 SQL合并整理 5 years ago
yulingwei 24d3e6ab07 修改bug 5 years ago
yulingwei 046beee6be 修改bug 5 years ago
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing f4cb9a98c8 数据管理启动机型代码优化 5 years ago
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化 5 years ago
sunke d941477d47 时间检索 资质认证 5 years ago
chenzhi a29227c2cd 数据库data更新 5 years ago
tpingzhang ed4a184f79 sdk 支付信息 5 years ago
chenxiaojun 917b88af21 添加索引 5 years ago
chenxiaojun fbed3ef1f7 添加索引 5 years ago
tpingzhang a803b27918 ALTER TABLE `tab_deposit`
ADD COLUMN `pay_url`  text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '支付信息' AFTER `check_sign`;
5 years ago
tpingzhang 9fc38d81e3 创建消息未读记录 5 years ago
tpingzhang 12a40d4ad4 增加tab_spend extend 字段长度到255 5 years ago
tpingzhang 4e273b375a 增加tab_spend extend 字段长度到255 5 years ago
zhengyongxing 0b15e9edd5 推广后台管理中心修正 5 years ago
sunke ee8a954566 查看消费记录滚动 5 years ago
ELF 1a0175e583 修改结构 5 years ago
sunke 438594827c 资质审核默初始化 5 years ago
chenxiaojun 4ecb391d74 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新 5 years ago
chenxiaojun 5afd0ffd63 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新 5 years ago
ELF afb6de56f8 添加3级变四级脚本 5 years ago
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新 5 years ago
chenzhi 58db110844 合并 5 years ago
chenzhi 115bafc067 新增补链日期及取消补链功能 5 years ago
ELF 831456b333 解决冲突 5 years ago
ELF ca84e029be 解决冲突 5 years ago
ELF a38e4b3690 修改sql 5 years ago
chenxiaojun 258d1fbc1a 推广后台->安全密码|财务管理--调整 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
jbrazz a7ff83f8cc upt 5 years ago
chenzhi 537ed0857a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 9d09fa4665 4角色聚合 5 years ago
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zhengchanglong 4dd2ab92f3 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev 5 years ago
“用lww 6dc6fecf6b Merge branch 'dev' into dev_lww 5 years ago
chenzhi 0ae24bf2cd 优化财务聚合接口2 5 years ago
“用lww 7549062127 新增分支dev_lww 5 years ago
sunke 62054af7df 安全中心数据表结构 5 years ago
chenzhi 81192f36c8 xiufu 5 years ago
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Data/update.sql
5 years ago
chenzhi c8da11a12e 新增平台币流水充值 5 years ago
tpingzhang ada60fd2f0 数据库 字段不够长 头像上传 5 years ago
chenzhi 4f7077a3ec 10311331 5 years ago
chenzhi 9803b418b9 优化统计 5 years ago
chenzhi 50efce9315 更新spen root 5 years ago
chenzhi d273c5af27 spendAPI优化 5 years ago
chenxiaojun 3f0ac1ff1a tab_partner表->partner字段更新 5 years ago
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理 5 years ago
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序 5 years ago
zhengchanglong eb4df6433b 更新首页快捷菜单名称 5 years ago
zhengchanglong c9fead3389 修改 tab_coin_pay_order 表字段 5 years ago