elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,449 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'e9be27136f'
${ noResults }
Commit Graph

488 Commits (e9be27136f3b85bae7900fa5578fe76edbfe53ad)

Author SHA1 Message Date
zhengyongxing acaebe0217 Merge branches 'feature/export_authority' and 'release' of 47.111.118.107:wmtx/platform into feature/export_authority 
 Conflicts:
	Data/update.sql
 5 years ago
zhengyongxing 60c0c8ee39 Merge branches 'feature/promote_data_config' and 'release' of 47.111.118.107:wmtx/platform into feature/promote_data_config 
 Conflicts:
	Data/update.sql
 5 years ago
chenzhi 501574fc7e up更新 5 years ago
zhengyongxing b6b97c130d 测试资源代码修正 5 years ago
chenzhi 990c62b06a 批注增删改查 5 years ago
zhengyongxing e60b9b2edf 测试资源批量封号 5 years ago
chenzhi 51322e3317 聚合财务2 5 years ago
chenzhi 6d0e7c3a00 聚合对账1 5 years ago
chenzhi 73ac725950 聚合脚本ok 5 years ago
chenzhi 95cd9993e2 聚合财务1 5 years ago
zhengyongxing 4d938b85f4 导出账号权限修改配置 5 years ago
zhengyongxing 295ca2d803 推广员业务配置功能添加 5 years ago
ELF 908722c5be 修改 5 years ago
chenzhi c4eb963cfe 财务比对5 5 years ago
chenzhi def286ec80 财务比较2 5 years ago
zhengyongxing f40bd57698 支付渠道意愿统计bug上传 5 years ago
zhengyongxing f7c9730153 市场结算管理优化 5 years ago
zhengyongxing 4ce89ee670 支付白名单列表功能完善 5 years ago
ELF 4a1ffd2955 解决冲突 5 years ago
廖金灵 a6f82e5820 Merge branch 'feature/work_order' of wmtx/platform into release 
修改默认评价分数为5分
 5 years ago
yulingwei 9eac722222 修改评分默认5分 5 years ago
zhengyongxing 2adbd95bfb Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/ip_forbit 
 Conflicts:
	Data/update.sql
 5 years ago
yulingwei 26f89f3c64 merge 5 years ago
zhengyongxing c3adec70ec ip限制白名单提交 5 years ago
ELF bda92e4e1a 用户重复标识-注册事件通知 5 years ago
ELF b434d2eacc 优化游戏管理 5 years ago
chenzhi ccaa9d3a78 优化公会游戏统计sql 5 years ago
ELF dae2dd5fd9 优化游戏 5 years ago
yulingwei b8fda2417a 工单管理 5 years ago
zhengyongxing 55ad393efb 支付渠道添加索引 5 years ago
zhengyongxing 141bdf561a 支付渠道添加索引 5 years ago
zhengyongxing 84d061c887 sql更新 5 years ago
chenzhi f40072e7d7 Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release 5 years ago
chenzhi 518d2aa3f6 优化操作日志表结构 5 years ago
zhengyongxing 04f2b0c8df Merge branch 'feature/operation_log' into release 
# Conflicts:
#	Application/Admin/Common/extend.php
#	Data/update.sql
 5 years ago
sunke 1f6de9be57 操作日志 5 years ago
zhanglingsheng d8cd3ae79f 身份证数据添加info字段 5 years ago
liuweiwen 5d05edbca6 资源自动审核扣除已审核额度，申请后续增加自动审核功能 5 years ago
zhengyongxing 3c628fa1c6 统计日志添加 5 years ago
liuweiwen 9d7cfd768e 修改sql 5 years ago
liuweiwen cc8e2149e0 最低额度，最高额度，比例数据格式校验 5 years ago
chenzhi 50e4185d9c 操作日志-登陆记录 5 years ago
liuweiwen aa8d296dd8 推广后台-》测试资源申请-》符合规则的自动审核 5 years ago
liuweiwen 02920aab8a 资源审核配置列表、新增、编辑、删除、锁定、解锁 5 years ago
chenzhi 6dfb13e4d9 新增操作权限 5 years ago
zhanglingsheng 2c7eb8f191 支付类型添加易宝支付 5 years ago
zhanglingsheng 31466db00d 支付类型添加易宝支付 5 years ago
zhengchanglong 6b68ae8197 Merge branch 'feature/admin_optimize' into release 
# Conflicts:
#	Data/update.sql
 5 years ago
ELF dad83c8d38 押金付款方式添加选项 5 years ago
zhengyongxing 4f65efad9b 结算单管理添加审核状态 5 years ago
liuweiwen f6af63ca3e 合同期限为空时间格式，公司信息导航高亮 5 years ago
chenzhi 43a3beae23 合并财务分类汇总 5 years ago
sunke b191bdec8e sql 5 years ago
yulingwei e26f517df1 冲突解决 5 years ago
yulingwei 747bba16b0 汇总结算单管理 5 years ago
zhengchanglong 7672e06b4b Merge branch 'hotfix/test_order' into release 
# Conflicts:
#	Data/update.sql
 5 years ago
zhengchanglong e1ab1eade6 更新SQL信息 5 years ago
zhengchanglong 858c028faf Merge branch 'feature/add_promote_company' into release 
# Conflicts:
#	Data/update.sql
 5 years ago
zhengyongxing e6d136410d Merge branch 'feature/admin_optimize' into release 5 years ago
liuweiwen e15460b08f 合作方 5 years ago
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