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 |