zhengyongxing
|
d6b1916a5d
|
11月功能提交
|
4 years ago |
 ELF
|
dd7068e3ae
|
改用redis存储session
|
4 years ago |
|
ELF
|
6a50654045
|
游戏统计/后台登录时间修改
|
4 years ago |
|
ELF
|
53f3ad6864
|
优化
|
4 years ago |
|
ELF
|
dfdc31f4dc
|
市场专员信息显示通过权限控制
|
4 years ago |
|
zhengyongxing
|
b3658dfaa9
|
比例方法提交
|
4 years ago |
|
zhengyongxing
|
bb5547fb6f
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_item_other
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
befa97e04d
|
Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item
|
4 years ago |
chenzhi
|
96b296a4b6
|
优化比例为空
|
4 years ago |
|
zhengyongxing
|
8340ddc115
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
c27315d3c0
|
外团推广功能提交
|
4 years ago |
|
chenzhi
|
7ade60fb02
|
优化比例获取
|
4 years ago |
|
zhengyongxing
|
97c33c8e1b
|
游戏比例公用方法修正
|
4 years ago |
|
zhengyongxing
|
5c497b94dc
|
分成比例导出修正
|
4 years ago |
|
chenzhi
|
10d13472ec
|
紧急修复外团选择游戏
|
4 years ago |
|
zhengyongxing
|
6ac5c1d524
|
比例逻辑修改
|
4 years ago |
|
zhengyongxing
|
9bf3c89659
|
特殊比例与模板比例添加流水类型
|
4 years ago |
|
ELF
|
2b1980bfbd
|
修改
|
4 years ago |
|
zhengyongxing
|
ab9be65422
|
内部公司功能提交
|
4 years ago |
|
chenzhi
|
b899ff7af7
|
优化汇总说明
|
4 years ago |
|
chenzhi
|
ae9d7f7574
|
优化重算按钮的出现
|
4 years ago |
|
ELF
|
6e2fda1e26
|
解决冲突
|
4 years ago |
|
廖金灵
|
d48e90e1db
|
Merge branch 'feature/new_game_auth' of wmtx/platform into release
新增游戏自动授权
|
4 years ago |
|
ELF
|
32bc839dcd
|
合并
|
4 years ago |
|
ELF
|
e0bbec0978
|
修改
|
4 years ago |
|
elf@home
|
c40fbf3870
|
新增游戏自动授权
|
4 years ago |
|
chenzhi
|
ff19f3259f
|
优化下游公司多比例结算
|
4 years ago |
|
chenzhi
|
4f70b89063
|
优化系统任务执行
|
4 years ago |
|
chenzhi
|
b88f2986bd
|
优化重算，兼容wind
|
4 years ago |
|
chenzhi
|
8b82fff791
|
优化任务插入
|
4 years ago |
|
chenzhi
|
62b566e8b8
|
优化地址填写
|
4 years ago |
|
chenzhi
|
f0e43df7c2
|
新增重算
|
4 years ago |
|
chenzhi
|
fb75494c64
|
新增系统执行命令方法
|
4 years ago |
|
chenzhi
|
9f06436207
|
优化转换注释
|
4 years ago |
|
chenzhi
|
04ac1da1d7
|
优化公司控制会长游戏规则
|
4 years ago |
|
chenzhi
|
ef4702fb46
|
暂存
|
4 years ago |
|
ELF
|
0803b686c3
|
解决冲突
|
4 years ago |
|
ELF
|
0206a422f9
|
解决冲突
|
4 years ago |
|
ELF
|
557f0203ac
|
解决冲突
|
4 years ago |
|
ELF
|
62d7f15fdc
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
|
4 years ago |
|
zhengyongxing
|
1fff2e6c09
|
财务代码搬到新的分支上
|
4 years ago |
|
chenzhi
|
2619e598e8
|
合并marster
|
4 years ago |
yulingwei
|
2fbea72d26
|
up
|
4 years ago |
|
chenzhi
|
afac0376be
|
新增下游审批
|
4 years ago |
|
chenzhi
|
cafdc39f2a
|
优化添加
|
4 years ago |
|
chenzhi
|
d662c89b7e
|
zancun
|
4 years ago |
|
ELF
|
e8a925b64c
|
游戏统计添加聚合充值数据
|
4 years ago |
|
chenzhi
|
5aa7427504
|
新增公司信息编辑
|
4 years ago |
|
chenzhi
|
33cf2cf8a6
|
新增审核列表
|
4 years ago |
|
chenzhi
|
f66ec6d1ff
|
优化函数
|
4 years ago |
|
chenzhi
|
296b5a0d8f
|
优化关系函数
|
4 years ago |
|
ELF
|
15d0b454a4
|
修改
|
4 years ago |
|
chenzhi
|
d6ec8e0248
|
新增导出
|
4 years ago |
|
ELF
|
f167d63c4a
|
修改
|
4 years ago |
|
zhengyongxing
|
15b9efcd7e
|
江息网络漏掉的修改
|
4 years ago |
|
zhengyongxing
|
f63b115641
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/add.html
# Application/Admin/View/PromoteCompany/edit.html
|
4 years ago |
|
zhengyongxing
|
a8f4f16349
|
Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/view.html
# Data/update.sql
|
4 years ago |
|
廖金灵
|
c4ec5753f0
|
Merge branch 'feature/loginInfo' of wmtx/platform into release
手机验证码登录推广后台
|
4 years ago |
|
zhengyongxing
|
4ff957d0f1
|
将官方渠道修改为江息网络
|
5 years ago |
|
chenzhi
|
6a3b9b6da3
|
新增游戏分成比例
|
5 years ago |
sunke
|
2a017bfb45
|
loginmodel
|
5 years ago |
|
zhengyongxing
|
132b601f74
|
测试资源搜索功能添加
|
5 years ago |
|
zhengyongxing
|
6081e088db
|
游戏统计bug修改
|
5 years ago |
|
zhengyongxing
|
057a51dbeb
|
游戏统计bug修正
|
5 years ago |
|
zhengyongxing
|
81bd79ecf8
|
游戏统计bug修正
|
5 years ago |
|
zhengyongxing
|
4b63c7b786
|
游戏统计bug修正
|
5 years ago |
|
zhengyongxing
|
b768d41935
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/export_authority
Conflicts:
Application/Home/Controller/PackageController.class.php
|
5 years ago |
|
zhengyongxing
|
b6b97c130d
|
测试资源代码修正
|
5 years ago |
|
zhengyongxing
|
b698495dbb
|
游戏统计添加元素修正
|
5 years ago |
|
ELF
|
d9cc82f73a
|
修改网站注册
|
5 years ago |
|
ELF
|
908722c5be
|
修改
|
5 years ago |
|
zhengyongxing
|
fcc7bf2aaa
|
管理后台-财务管理-游戏统计-添加元素
|
5 years ago |
|
zhengyongxing
|
001e9e70f8
|
管理后台导出权限添加
|
5 years ago |
|
ELF
|
41e1801550
|
修改手机登录bug
|
5 years ago |
|
廖金灵
|
bab7fec46d
|
Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
|
5 years ago |
|
廖金灵
|
9222d99127
|
Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
|
5 years ago |
chenzhi
|
2401acb9a0
|
优化公会统计bug
|
5 years ago |
|
chenzhi
|
2b7f434955
|
财务管理-游戏管理 游戏名称列表和导出优化
|
5 years ago |
|
chenzhi
|
55d49e8b4b
|
优化推广公会列表导出
|
5 years ago |
|
ELF
|
4a1ffd2955
|
解决冲突
|
5 years ago |
|
chenzhi
|
1761d37b5c
|
推广公会列表 适配新内外团规则
|
5 years ago |
|
chenzhi
|
d7662eb305
|
推广员现在归属于公司团体
|
5 years ago |
|
zhengyongxing
|
6f749fb99d
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_opertion_log
Conflicts:
Application/Admin/Controller/FinancePromoteController.class.php
Application/Common/Common/extend.php
|
5 years ago |
|
廖金灵
|
a1f3c6e205
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
|
5 years ago |
|
yulingwei
|
ead4a8598e
|
upt
|
5 years ago |
|
zhengyongxing
|
a086b38d3e
|
管理后台日志唯一键值bug修改
|
5 years ago |
|
zhengyongxing
|
958fb41227
|
管理后台日志唯一键值修改
|
5 years ago |
|
chenzhi
|
381327ae21
|
优化游戏统计
|
5 years ago |
|
ELF
|
dae2dd5fd9
|
优化游戏
|
5 years ago |
|
zhengyongxing
|
b87dec3aee
|
管理员权限从用户改成以组的形式
|
5 years ago |
|
zhengyongxing
|
665b4c8bfa
|
推广结算管理日志添加
|
5 years ago |
chenxiaojun
|
118aae4f83
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
liuweiwen
|
87de8d2717
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
|
zhengyongxing
|
00a5fed6fd
|
游戏统计新增设备类型
|
5 years ago |
liuweiwen
|
a1c3ad8fb3
|
数据展示权限
|
5 years ago |
|
yulingwei
|
6b6baa4f92
|
合并
|
5 years ago |
|
chenxiaojun
|
2c52bccaf7
|
管理后台>推广员>结算管理>推广提现>自动审核管理--更新
|
5 years ago |
|
jbRotk
|
c968e54cf8
|
解决冲突
|
5 years ago |
|
chenxiaojun
|
cbe40d4b0f
|
管理后台更新
|
5 years ago |