zhengyongxing
|
a9ce0585cc
|
测试资源配置
|
5 years ago |
chenzhi
|
2a28cf9008
|
聚合财务优化权限
|
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 |
|
chenzhi
|
fe662ce160
|
审核子操作ok
|
5 years ago |
|
zhengyongxing
|
b6b97c130d
|
测试资源代码修正
|
5 years ago |
|
chenzhi
|
16d9813e18
|
聚合财务重算
|
5 years ago |
|
zhengyongxing
|
b698495dbb
|
游戏统计添加元素修正
|
5 years ago |
|
chenzhi
|
253b47b2a9
|
聚合财务子操作
|
5 years ago |
|
chenzhi
|
990c62b06a
|
批注增删改查
|
5 years ago |
|
chenzhi
|
6b5f60f8e6
|
新增凭证增删改查
|
5 years ago |
|
chenzhi
|
ce4c938080
|
优化聚合结算导出
|
5 years ago |
|
chenzhi
|
cf9480eb89
|
聚合财务导出
|
5 years ago |
|
chenzhi
|
422728ed11
|
聚合财务编辑
|
5 years ago |
|
zhengyongxing
|
0ebde4cb17
|
导出权限修正
|
5 years ago |
|
chenzhi
|
bf7c7ed14f
|
审核
|
5 years ago |
|
zhengyongxing
|
e60b9b2edf
|
测试资源批量封号
|
5 years ago |
|
chenzhi
|
114cf4a503
|
聚合对账新增对账金额统计
|
5 years ago |
|
chenzhi
|
51322e3317
|
聚合财务2
|
5 years ago |
|
chenzhi
|
6d0e7c3a00
|
聚合对账1
|
5 years ago |
|
zhengyongxing
|
63e4789069
|
游戏编辑支付宝 汇付宝添加
|
5 years ago |
 ELF
|
0af6a53ba7
|
后台arpu功能优化
|
5 years ago |
|
zhengyongxing
|
a5554f7fa3
|
推广员业务配置功能添加
|
5 years ago |
|
zhengyongxing
|
295ca2d803
|
推广员业务配置功能添加
|
5 years ago |
|
zhengyongxing
|
1a0b2dbaba
|
推广员游戏列表查看全选问题
|
5 years ago |
|
zhengyongxing
|
fcc7bf2aaa
|
管理后台-财务管理-游戏统计-添加元素
|
5 years ago |
|
zhengyongxing
|
322b4b6cee
|
管理后台导出权限添加
|
5 years ago |
|
zhengyongxing
|
001e9e70f8
|
管理后台导出权限添加
|
5 years ago |
|
廖金灵
|
7ab6c8ad68
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
修复问题
|
5 years ago |
yulingwei
|
2ac6f7ebee
|
upt
|
5 years ago |
|
廖金灵
|
820885f3dd
|
Merge branch 'feature/platform_rule' of wmtx/platform into release
推广规则
|
5 years ago |
sunke
|
bde08adcc2
|
平台币
|
5 years ago |
|
廖金灵
|
8b2ae9d6da
|
Merge branch 'feature/fix_work_order' of wmtx/platform into release
工单统计及iOS下载数优化
|
5 years ago |
|
廖金灵
|
72d1d2f338
|
Merge branch 'feature/president_modify' of wmtx/platform into release
修改会长押金编辑付款人付款账号非必填
|
5 years ago |
|
sunke
|
0758921bfe
|
平台
|
5 years ago |
|
sunke
|
848eb6c294
|
平台
|
5 years ago |
|
sunke
|
b6649a7b9d
|
平台币
|
5 years ago |
|
yulingwei
|
ac83e556ff
|
upt
|
5 years ago |
|
yulingwei
|
f1428a8fe7
|
upt
|
5 years ago |
|
sunke
|
031528411b
|
平台币
|
5 years ago |
|
sunke
|
5fa22cfa40
|
弹窗
|
5 years ago |
|
sunke
|
fee97bb00a
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/platform_rule
|
5 years ago |
|
yulingwei
|
e462305587
|
upt
|
5 years ago |
|
sunke
|
c1168740b6
|
平台币
|
5 years ago |
|
sunke
|
253c956794
|
平台币
|
5 years ago |
|
sunke
|
2adcb68c06
|
平台币新增需求
|
5 years ago |
|
sunke
|
1fe794b597
|
平台规则样式优化
|
5 years ago |
|
sunke
|
bdb688c985
|
编辑规则
|
5 years ago |
|
zhengyongxing
|
2a54b0ed08
|
汇付宝添加支付宝与微信
|
5 years ago |
|
ELF
|
94575cae29
|
修改会长押金编辑付款人付款账号非必填
|
5 years ago |
|
yulingwei
|
c1d03cc526
|
upt
|
5 years ago |
|
zhengyongxing
|
541ec17db5
|
隐藏威富通添加汇付宝
|
5 years ago |
|
yulingwei
|
007374e121
|
upt
|
5 years ago |
|
廖金灵
|
8dc7adb539
|
Merge branch 'feature/giftbag_tf' of wmtx/platform into release
添加tf礼包
|
5 years ago |
|
sunke
|
15f6cb19a3
|
渠道支付顺序
|
5 years ago |
|
ELF
|
2a2e5f0d31
|
添加tf礼包问题
|
5 years ago |
|
sunke
|
b4e66dcd40
|
隐藏推广配置
|
5 years ago |
张谷诚
|
c5af3c29d7
|
Merge branch 'hotfix/finance_game_name_change_2' of wmtx/platform into release
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
廖金灵
|
9f202c3991
|
Merge branch 'feature/finance_compare' of wmtx/platform into release
财务导入对比
|
5 years ago |
|
chenzhi
|
9237bc3cc8
|
优化选择
|
5 years ago |
|
廖金灵
|
86a90467ff
|
Merge branch 'feature/president_apply' of wmtx/platform into release
修改会长押金需求
|
5 years ago |
|
zhengyongxing
|
d4aafd2983
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
yulingwei
|
6f7d285f9f
|
修复资源工单完成情况
|
5 years ago |
|
chenzhi
|
c0df7f23c3
|
优化高亮
|
5 years ago |
|
zhengyongxing
|
dc5437d7cb
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
chenzhi
|
d4a498baba
|
优化用户登录时间为0时为暂无登录
|
5 years ago |
|
chenzhi
|
5ddf75a600
|
财务对比ok
|
5 years ago |
|
chenzhi
|
b2ad4e8b6e
|
财务对比 v1
|
5 years ago |
|
chenzhi
|
a2db46d1c0
|
财务对比首页
|
5 years ago |
|
zhengyongxing
|
f37cdc596d
|
支付渠道测试订单录入bug修正，支付意愿统计功能优化
|
5 years ago |
|
chenzhi
|
79f4719dec
|
财务对比7
|
5 years ago |
|
chenzhi
|
c4eb963cfe
|
财务比对5
|
5 years ago |
|
zhengyongxing
|
de646044c2
|
支付渠道详情检索修正
|
5 years ago |
|
zhengyongxing
|
e7e7df569b
|
支付渠道统计bug修改
|
5 years ago |
|
chenzhi
|
202f9a45d1
|
财务对比4
|
5 years ago |
|
chenzhi
|
effe6c572e
|
财务比较3
|
5 years ago |
|
zhengyongxing
|
96eee4f9f5
|
支付渠道统计bug修改
|
5 years ago |
|
zhengyongxing
|
ab01c02606
|
支付渠道意愿统计修改
|
5 years ago |
|
chenzhi
|
33be2ba05b
|
优化游戏统计平台币直充搜索后数据不符合问题
|
5 years ago |
|
chenzhi
|
def286ec80
|
财务比较2
|
5 years ago |
|
廖金灵
|
bab7fec46d
|
Merge branch 'fix/fiancecount_gamename_change' of wmtx/platform into release
游戏名称不含设备类型优化
|
5 years ago |
|
chenzhi
|
eaa51463e5
|
公会统计
|
5 years ago |
|
chenzhi
|
ea69ecb086
|
财务比较2
|
5 years ago |
|
张谷诚
|
13c352a924
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿a标签悬停变成手势
|
5 years ago |
|
chenzhi
|
e0c946e67c
|
工会统计2
|
5 years ago |
|
chenzhi
|
b36515a720
|
工会统计
|
5 years ago |
|
chenzhi
|
48e5e4d824
|
财务对比1
|
5 years ago |
|
zhengyongxing
|
4361b3c3ba
|
支付渠道意愿a标签悬停变成手势
|
5 years ago |
|
廖金灵
|
d781d6825c
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计文字修改，及排序方式修正
|
5 years ago |
|
zhengyongxing
|
674e727921
|
支付渠道意愿统计文字修改
|
5 years ago |
|
张谷诚
|
170b116333
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
|
5 years ago |
|
zhengyongxing
|
9eff370801
|
支付渠道意愿统计bug上传
|
5 years ago |
|
张谷诚
|
e42281bdfe
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付渠道意愿统计bug上传
|
5 years ago |
|
zhengyongxing
|
f40bd57698
|
支付渠道意愿统计bug上传
|
5 years ago |
|
廖金灵
|
985fdab851
|
Merge branch 'feature/limit_pay' of wmtx/platform into release
支付限额
|
5 years ago |
|
张谷诚
|
b9f466f73c
|
Merge branch 'feature/pay_white_list' of wmtx/platform into release
支付意向
支付限额白名单
|
5 years ago |
|
zhengyongxing
|
f7c9730153
|
市场结算管理优化
|
5 years ago |
|
sunke
|
163ad97d60
|
支付限额
|
5 years ago |
|
sunke
|
817b39c391
|
支付限额
|
5 years ago |
|
sunke
|
56b5144440
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/limit_pay
|
5 years ago |
|
廖金灵
|
9222d99127
|
Merge branch 'feature/change_company_belong' of wmtx/platform into release
推广员内外团归属优化
|
5 years ago |
|
sunke
|
68572d10e6
|
支付限额
|
5 years ago |
|
chenzhi
|
d6e44d32dc
|
优化推广员申请游戏名称及选择样式
|
5 years ago |
|
chenzhi
|
84fe51efef
|
支付渠道/测试订单 游戏名字优化
|
5 years ago |
|
chenzhi
|
6d3f1b67e2
|
支付渠道统计-首页 名称优化
|
5 years ago |
|
sunke
|
ab1c99d95a
|
时间
|
5 years ago |
|
sunke
|
dfb83d35d0
|
时间样式
|
5 years ago |
|
ELF
|
ef56ea2180
|
修改
|
5 years ago |
|
ELF
|
a512fb224e
|
修改bug
|
5 years ago |
|
ELF
|
fb6a00859e
|
修改会长押金需求
|
5 years ago |
|
sunke
|
098caeaa90
|
时间样式
|
5 years ago |
|
sunke
|
4f98f9fabe
|
样式控制
|
5 years ago |
|
chenzhi
|
cc966711d1
|
公会统计 游戏名称与设备名称分开
|
5 years ago |
|
zhengyongxing
|
4ce89ee670
|
支付白名单列表功能完善
|
5 years ago |
|
zhengyongxing
|
6b8f9a47d0
|
Merge branch 'feature/user_paywhite_list' of 47.111.118.107:wmtx/platform into feature/pay_white_list
|
5 years ago |
|
zyx
|
fc9fa629ae
|
游戏充值bug修改
|
5 years ago |
|
sunke
|
fa70a3c77a
|
限制规则
|
5 years ago |
|
zhengyongxing
|
ad08aeeace
|
支付意向统计代码提交
|
5 years ago |
|
sunke
|
ac54bb41a4
|
支付限额导出
|
5 years ago |
|
sunke
|
5c8221d9dc
|
支付限额
|
5 years ago |
|
chenzhi
|
9064fc7c58
|
游戏统计 游戏名称不含设备类型优化
|
5 years ago |
|
chenzhi
|
121fc02f18
|
推广员内外团归属优化2
|
5 years ago |
|
chenzhi
|
55d49e8b4b
|
优化推广公会列表导出
|
5 years ago |
|
chenzhi
|
61d0418340
|
推广公司管理 修改内外团影响底下
|
5 years ago |
|
chenzhi
|
1761d37b5c
|
推广公会列表 适配新内外团规则
|
5 years ago |
|
chenzhi
|
d7662eb305
|
推广员现在归属于公司团体
|
5 years ago |
|
chenzhi
|
dd86a85485
|
推广公会归属管理 改为公会归属不可选择
|
5 years ago |
|
yulingwei
|
82620c9ae6
|
merge
|
5 years ago |
|
yulingwei
|
bec210c158
|
修复会员层级关系检索问题
|
5 years ago |
|
chenzhi
|
d7737291ed
|
暂存1
|
5 years ago |
|
廖金灵
|
43562f6746
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
修复检索问题
|
5 years ago |
|
yulingwei
|
c40f5dda26
|
upt
|
5 years ago |
|
sunke
|
797102a556
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/PlatFormCoinData
|
5 years ago |
|
sunke
|
5b74e65585
|
统计
|
5 years ago |
|
zhengyongxing
|
6249b6cf81
|
Merge branches 'feature/fee_form' and 'release' of 47.111.118.107:wmtx/platform into feature/fee_form
Conflicts:
Application/Admin/Controller/FinanceController.class.php
|
5 years ago |
|
zhengyongxing
|
87b1b04040
|
充值财务管理金额保留小数点
|
5 years ago |
|
廖金灵
|
4c8cb3c171
|
Merge branch 'feature/IOSdata' of wmtx/platform into release
修改bug
|
5 years ago |
|
sunke
|
fea5f4d2d7
|
ios
|
5 years ago |
|
廖金灵
|
bf80a2d99a
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
问题修复
|
5 years ago |
|
yulingwei
|
132dee220a
|
fix
|
5 years ago |
|
sunke
|
7194cd49ae
|
平台币
|
5 years ago |
|
廖金灵
|
21bf9744fb
|
Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip限制白名单苹果内购限制总开关去除
|
5 years ago |
|
zhengyongxing
|
6ac97fa7b1
|
ip限制白名单页面去除内购总开关
|
5 years ago |
|
廖金灵
|
112134ec93
|
Merge branch 'feature/work_order' of wmtx/platform into release
修改样式问题
|
5 years ago |
|
廖金灵
|
e8282fc00c
|
Merge branch 'feature/ip_forbit' of wmtx/platform into release
ip白名单页面问题修正
|
5 years ago |
|
zhengyongxing
|
bd181dab51
|
ip限制白名单页面修改
|
5 years ago |
|
yulingwei
|
3415ef8336
|
修改样式问题
|
5 years ago |
|
sunke
|
fd815ef5a6
|
html平台币
|
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 |
|
sunke
|
e94c64a881
|
平台币统计
|
5 years ago |
|
廖金灵
|
3be1bd78ed
|
Merge branch 'feature/work_order' of wmtx/platform into release
工单管理
|
5 years ago |
|
yulingwei
|
26f89f3c64
|
merge
|
5 years ago |
|
廖金灵
|
aae20bce96
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
修改下载统计bug
|
5 years ago |
|
yulingwei
|
f34975478b
|
upt
|
5 years ago |
|
廖金灵
|
a1f3c6e205
|
Merge branch 'feature/download_type_list' of wmtx/platform into release
iOS下载统计
|
5 years ago |
|
廖金灵
|
e2a32b11dc
|
Merge branch 'fix/member_user_info' of wmtx/platform into release
玩家列表新增去重数据栏
|
5 years ago |
|
zhengyongxing
|
e7aa7885e8
|
ip限制白名单提示语修改
|
5 years ago |
|
zhengyongxing
|
1d27db663a
|
ip限制白名单提示语修改
|
5 years ago |
|
zhengyongxing
|
5f815370e8
|
ip限制白名单提交
|
5 years ago |
|
sunke
|
41f6797e97
|
表格样式
|
5 years ago |
|
sunke
|
7da471b6ee
|
支付时间
|
5 years ago |
|
yulingwei
|
4afce87caa
|
upt
|
5 years ago |
|
yulingwei
|
b56ba0b882
|
upt
|
5 years ago |
|
yulingwei
|
823062c0f6
|
upt
|
5 years ago |
|
yulingwei
|
adf11e2b60
|
upt
|
5 years ago |
|
yulingwei
|
175502e384
|
fix
|
5 years ago |
|
yulingwei
|
b10717e8b6
|
upt
|
5 years ago |
|
chenzhi
|
bfee0578d0
|
玩家列表新增去重数据栏
|
5 years ago |
|
yulingwei
|
18b0c3024d
|
upt
|
5 years ago |
|
yulingwei
|
ead4a8598e
|
upt
|
5 years ago |
|
yulingwei
|
d9c338acd8
|
upt
|
5 years ago |
|
chenzhi
|
381327ae21
|
优化游戏统计
|
5 years ago |
|
chenzhi
|
45cad05508
|
优化用户列表统计数据
|
5 years ago |
|
chenzhi
|
44afe1f65d
|
优化玩家列表统计方式及回退去重功能
|
5 years ago |
|
yulingwei
|
fa41426908
|
upt
|
5 years ago |
|
yulingwei
|
1e3533720b
|
utp
|
5 years ago |
|
yulingwei
|
b8fda2417a
|
工单管理
|
5 years ago |
|
sunke
|
389ef7e967
|
bug修复
|
5 years ago |
|
zhengyongxing
|
48239c0f13
|
测试订单bug修改
|
5 years ago |
|
sunke
|
2ecb05d924
|
支付渠道统计
|
5 years ago |
|
sunke
|
3edb0640ed
|
新增管理后台测试订单导出功能
|
5 years ago |
|
chenzhi
|
0344471659
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
cfbbf8e76b
|
优化默认公司名称为海南万盟天下科技
|
5 years ago |
|
chenzhi
|
50b21f45ab
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
7fa400a0a5
|
优化公会统计统计栏样式
|
5 years ago |
|
zhengyongxing
|
443abed206
|
Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log
|
5 years ago |
|
zhengyongxing
|
19d85f3717
|
测试资源可用余额接口修改
|
5 years ago |
|
zhengyongxing
|
caddcd1543
|
日志管理删除url开启
|
5 years ago |
|
zhengyongxing
|
14c3d365e3
|
Merge branch 'feature/user_repeat' into release
|
5 years ago |
|
zhengyongxing
|
ffd6238bc1
|
测试订单bug修正
|
5 years ago |
|
chenzhi
|
cc3552b862
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
d0f07315da
|
操作日志前端检索名词修改
|
5 years ago |
|
chenzhi
|
62c8c1e54d
|
Merge branch 'feature/operation_log' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
dd0f930105
|
游戏预告-操作日志
|
5 years ago |
|
zhengyongxing
|
0443871173
|
用户列表去除重复行
|
5 years ago |
|
zhengyongxing
|
77ddb1eded
|
Merge branch 'feature/operation_log' into release
|
5 years ago |
|
zhengyongxing
|
31948abdf4
|
操作日志bug修正
|
5 years ago |
liuweiwen
|
969bf4dc8a
|
Merge branch 'feature/yibao_company' into release
# Conflicts:
# Application/Admin/Common/extend.php
|
5 years ago |
|
liuweiwen
|
5d596094a6
|
增加易宝支付
|
5 years ago |
|
liuweiwen
|
3b415976eb
|
增加易宝支付
|
5 years ago |
|
liuweiwen
|
aa7e6fa0ec
|
推广公司新增与编辑减少必填项
|
5 years ago |
|
chenzhi
|
31a0a174bd
|
后台发放-操作日志
|
5 years ago |
|
liuweiwen
|
c9d69414ba
|
Merge branch 'hotfix/game_recharge_stat' into release
|
5 years ago |
|
liuweiwen
|
22aa120ad6
|
去掉多余的换行
|
5 years ago |
|
liuweiwen
|
1a4bf752c4
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
zhengyongxing
|
04f2b0c8df
|
Merge branch 'feature/operation_log' into release
# Conflicts:
# Application/Admin/Common/extend.php
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
b081544805
|
Merge branch 'hotfix/game_recharge_stat' into release
|
5 years ago |
|
liuweiwen
|
4a45103650
|
平台币充值汇总补一列
|
5 years ago |
|
zhengyongxing
|
5224eec9f2
|
上游结算单管理日志添加
|
5 years ago |
|
liuweiwen
|
9221b18955
|
游戏统计汇总权限
|
5 years ago |
|
zhengyongxing
|
5e794bd785
|
推广员日志记录添加
|
5 years ago |
|
zhengyongxing
|
8aae878cf8
|
游戏统计修改
|
5 years ago |
zhanglingsheng
|
9c39b731fd
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
zhanglingsheng
|
dbd1e6f070
|
易宝支付配置
|
5 years ago |
|
liuweiwen
|
94293b4bec
|
Merge branch 'feature/resource_config' into release
|
5 years ago |
|
liuweiwen
|
b4fafbe0bf
|
修改配置比例范围
|
5 years ago |
|
liuweiwen
|
fa9746342f
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
cc8e2149e0
|
最低额度，最高额度，比例数据格式校验
|
5 years ago |
zhengchanglong
|
ba96083bb5
|
录入测试订单 时间控件修改
|
5 years ago |
|
zhengyongxing
|
a6a29bf63a
|
统计日志添加
|
5 years ago |
|
chenzhi
|
55fd5d94e8
|
实名认证，防沉迷
|
5 years ago |
|
liuweiwen
|
7d879686af
|
自动审核规则调整，锁定显示红色字体
|
5 years ago |
|
chenzhi
|
50e4185d9c
|
操作日志-登陆记录
|
5 years ago |
|
liuweiwen
|
aa8d296dd8
|
推广后台-》测试资源申请-》符合规则的自动审核
|
5 years ago |
|
liuweiwen
|
02920aab8a
|
资源审核配置列表、新增、编辑、删除、锁定、解锁
|
5 years ago |
|
zhengyongxing
|
dd478e264f
|
行为日志按照原型修改完成
|
5 years ago |
|
zhengyongxing
|
d2867b4635
|
行为日志完成
|
5 years ago |
|
zhengchanglong
|
7d13703398
|
角色列表角色ID和角色名改为不受权限控制
|
5 years ago |
|
liuweiwen
|
ad48df6c91
|
数据展示权限
|
5 years ago |
|
liuweiwen
|
446e6f8176
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
3f5739c1d7
|
游戏充值和平台币充值数据展示权限
|
5 years ago |
|
zhanglingsheng
|
a1b79b57ae
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
zhanglingsheng
|
31466db00d
|
支付类型添加易宝支付
|
5 years ago |
|
zhengyongxing
|
009ef6719d
|
结算单管理审核状态bug修改
|
5 years ago |
|
zhengyongxing
|
601151718f
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
e01bcc236f
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zhengyongxing
|
260ca6fe9e
|
结算单管理审核状态bug修改
|
5 years ago |
|
zhengchanglong
|
6b68ae8197
|
Merge branch 'feature/admin_optimize' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
eecd38e424
|
Merge branch 'fix/divide_test' into release
|
5 years ago |
|
liuweiwen
|
2cf7b7471f
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
305cbf34cd
|
导航高亮
|
5 years ago |
|
liuweiwen
|
941ba5628d
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
c05b10cb87
|
对账单系统-》未审核不可确认
|
5 years ago |
|
ELF
|
7cd28cc7ce
|
删除多余代码
|
5 years ago |
|
ELF
|
dad83c8d38
|
押金付款方式添加选项
|
5 years ago |
|
zhengyongxing
|
4f65efad9b
|
结算单管理添加审核状态
|
5 years ago |
|
chenzhi
|
da454a9474
|
Merge branch 'feature/data_divide' of 47.111.118.107:wmtx/platform into fix/divide_test
|
5 years ago |
chenxiaojun
|
f5c1531b71
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
|
chenxiaojun
|
23f38f6a07
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
|
chenzhi
|
c52ba1cf99
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
fa92868548
|
优化公会统计团体占比
|
5 years ago |
|
zhengyongxing
|
3c16659bf3
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
9edc77bead
|
生成下游个人结算单bug修改
|
5 years ago |
|
zhengyongxing
|
4d1cfb36ec
|
生成下游个人结算单bug修改
|
5 years ago |
|
chenzhi
|
1bfcade0a8
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
5b45c4273c
|
优化公会统计选择游戏
|
5 years ago |
|
yulingwei
|
5468239cf3
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
yulingwei
|
e8e0af97bf
|
修复结算时间
|
5 years ago |
|
chenzhi
|
43a6a746b0
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
f0d298c042
|
公会统计新增团体类型
|
5 years ago |
|
liuweiwen
|
077a770de7
|
奖罚记录管理-》奖罚时间为空判读，新增编辑判读
|
5 years ago |
|
liuweiwen
|
5b63a2fe84
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
f9fe74986c
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
f6af63ca3e
|
合同期限为空时间格式，公司信息导航高亮
|
5 years ago |
|
zhengyongxing
|
5158b07d85
|
测试订单管理高亮添加
|
5 years ago |
|
zhanglingsheng
|
a26a02b36f
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
zhengchanglong
|
c6a0f87dfe
|
奖罚编辑部分字段只读
|
5 years ago |
|
zhanglingsheng
|
9afd27cdc6
|
Merge branch 'hosfix/tool_pay' into release
|
5 years ago |
|
liuweiwen
|
5949542b70
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
6d91ec7c60
|
推广员-》奖罚记录管理-》上下游公司与公司类型联动，解决未显示下游公司问题
|
5 years ago |
|
zhengchanglong
|
e55bfcb2d8
|
奖罚编辑部分字段只读
|
5 years ago |
|
zhengchanglong
|
586dbf49e9
|
添加奖罚记录返回出现错误提示BUG修复
|
5 years ago |
|
liuweiwen
|
e243675bcc
|
将子窗口的方法转到ajax控制器
|
5 years ago |
|
liuweiwen
|
854ab9f509
|
合作方导出不打开新窗口
|
5 years ago |
|
liuweiwen
|
d50627e4fb
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
70c71abac1
|
隐藏我方分成比例
|
5 years ago |
|
chenzhi
|
07053d822e
|
Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
chenzhi
|
bb276f2bcc
|
优化推广公司列表
|
5 years ago |
|
liuweiwen
|
efe9d25988
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
d333b8d61e
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
8dedae5587
|
公司性质
|
5 years ago |
|
chenzhi
|
43a3beae23
|
合并财务分类汇总
|
5 years ago |
|
liuweiwen
|
2ac78def85
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
3bb3a8b45d
|
显示调整
|
5 years ago |
|
liuweiwen
|
70984bea99
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
48252d0f3a
|
合作方列表样式调整
|
5 years ago |
|
zhengchanglong
|
1b37ec3d37
|
Merge branch 'feature/add_promote_company' into release
|
5 years ago |
|
chenzhi
|
f5529fc2dd
|
优化推广公司首页样式
|
5 years ago |
|
liuweiwen
|
5544bb1797
|
合作方列表样式调整
|
5 years ago |
|
liuweiwen
|
4cb88be352
|
数据权限
|
5 years ago |
|
zhengchanglong
|
26038f379e
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengchanglong
|
8bd26b36c0
|
玩家账号信息权限设置
|
5 years ago |
|
yulingwei
|
d349c4223d
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
yulingwei
|
0652c31664
|
upt
|
5 years ago |
|
yulingwei
|
25e66d84ff
|
修改问题
|
5 years ago |
|
liuweiwen
|
87de8d2717
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
liuweiwen
|
32f5137ac6
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
04bb4a7bb7
|
合作方
|
5 years ago |
|
sunke
|
790d56c638
|
Merge branch 'feature/add_promote_company' of 47.111.118.107:wmtx/platform into feature/add_promote_company
|
5 years ago |
|
yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
|
yulingwei
|
747bba16b0
|
汇总结算单管理
|
5 years ago |
|
zhengyongxing
|
00a5fed6fd
|
游戏统计新增设备类型
|
5 years ago |
|
chenzhi
|
4eaa92f0fb
|
优化导出银行卡变科学计数
|
5 years ago |
|
liuweiwen
|
52668ace85
|
合作方导出优化
|
5 years ago |
|
yulingwei
|
47d01e0aff
|
upt
|
5 years ago |
|
ELF
|
35b267027c
|
Merge branch 'hotfix/download_name' into release
|
5 years ago |
|
ELF
|
129a1103e2
|
修改beta版下载名称
|
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 |
|
chenzhi
|
f507dde70b
|
新增推广公司导出功能
|
5 years ago |
|
yulingwei
|
dfe52865bd
|
upt
|
5 years ago |
|
zhengyongxing
|
64122ca8c7
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
3b47c94b1e
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zhengyongxing
|
2589a76603
|
生成下游个人结算单bug修改
|
5 years ago |
|
zhengchanglong
|
ec2c929450
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zhengchanglong
|
5f5abce2ec
|
玩家信息数据显示权限BUG修复
|
5 years ago |
|
zhengyongxing
|
0b7327bc4e
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
c8f333fa9a
|
生成下游个人结算单bug修改
|
5 years ago |
|
zhengyongxing
|
46ccf0e3ce
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
zhengyongxing
|
71dabfae53
|
生成下游个人结算单bug修改
|
5 years ago |
|
chenzhi
|
31deafcb3c
|
优化合作公司列表页面
|
5 years ago |
|
ELF
|
055e246f70
|
修改bug
|
5 years ago |
|
liuweiwen
|
6d13be7863
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
7da5e25e16
|
合作方
|
5 years ago |
|
zhengchanglong
|
c066620128
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
yulingwei
|
469a037b0f
|
merge
|
5 years ago |
|
chenzhi
|
5cea54585f
|
优化上游结算单选择后初始值变动
|
5 years ago |
|
chenzhi
|
8c25f55c6e
|
修复不能cp公司选择无效问题
|
5 years ago |
|
zhengchanglong
|
99f62f3c14
|
Merge branch 'feature/admin_optimize' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenzhi
|
44a34bc89f
|
新增推广公司删除
|
5 years ago |
|
chenzhi
|
4e28b39999
|
新增推广公司编辑功能
|
5 years ago |
|
chenzhi
|
6ea7a581f5
|
推广公司查看
|
5 years ago |
|
chenzhi
|
f218544e7f
|
优化推广公司添加
|
5 years ago |
|
chenzhi
|
da2e3a769c
|
推广列表查看
|
5 years ago |
|
liuweiwen
|
a1c3ad8fb3
|
数据展示权限
|
5 years ago |
|
liuweiwen
|
4b480e6f94
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
8462f80777
|
合作方
|
5 years ago |
|
zhengchanglong
|
4ce9af39e5
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
zhengyongxing
|
fb14c5888a
|
Merge branch 'hotfix/test_order' into release
|
5 years ago |
|
zhengyongxing
|
2d0d59c0a5
|
Merge branch 'hotfix/test_order' of 47.111.118.107:wmtx/platform into hotfix/test_order
Conflicts:
Application/Admin/Controller/TestOrderController.class.php
|
5 years ago |
|
zhengyongxing
|
12903ef3cd
|
测试订单列表与录入bug修改
|
5 years ago |
|
zhengyongxing
|
6f48940e21
|
生成下游个人结算单回退功能添加
|
5 years ago |
|
zhengyongxing
|
8dd5f7bf5c
|
结算单管理添加
|
5 years ago |
|
chenzhi
|
92929b1db7
|
优化推广公司添加
|
5 years ago |
|
chenzhi
|
84f5ff2e95
|
优化添加推广公司结构
|
5 years ago |
|
liuweiwen
|
ada2913cdc
|
奖罚记录管理根据公司类型搜索
|
5 years ago |
|
chenzhi
|
1f1e75e736
|
新增推广公司添加
|
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
|
031d40dc22
|
生成个人结算单编辑的功能模板
|
5 years ago |
|
zhengyongxing
|
955a1917b3
|
生成个人结算单的功能完成
|
5 years ago |
|
zhengchanglong
|
9b43cc90b4
|
Merge branch 'hotfix/test_order' into release
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
282033afe7
|
测试订单录入添加分页
|
5 years ago |
|
yulingwei
|
e670dfcf7c
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
yulingwei
|
e35f20ee70
|
游戏预警
|
5 years ago |
|
zhengchanglong
|
cb5cef678d
|
Merge branch 'hotfix/test_order' into release
|
5 years ago |
|
zhengchanglong
|
d0de91e89d
|
测试订单查询修改
|
5 years ago |
|
zhengchanglong
|
2b99184273
|
Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order
# Conflicts:
# Application/Admin/View/TestOrder/lists.html
|
5 years ago |
|
zhengchanglong
|
53b9573d71
|
测试订单查询修改
|
5 years ago |
|
zhengyongxing
|
8aba8728f0
|
测试订单录入功能提交
|
5 years ago |
|
zhengyongxing
|
56ecea6998
|
下游个人结算单生成代码上传
|
5 years ago |
|
zhengchanglong
|
284f42b315
|
测试订单录入
|
5 years ago |
|
zhengchanglong
|
fc0bb831a7
|
测试订单录入
|
5 years ago |
|
zhengchanglong
|
254d29f3f2
|
测试订单录入
|
5 years ago |
|
chenxiaojun
|
89c7855337
|
管理后台>推广员>结算管理>公会分成管理--更新
|
5 years ago |
|
sunke
|
8db53afc8b
|
电子文档及公司录入信息
|
5 years ago |
|
liuweiwen
|
319dde1090
|
奖罚记录管理根据公司类型搜索
|
5 years ago |
|
ELF
|
bc2f5dd117
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
ELF
|
bbb31890f6
|
未收押金会长禁用落地页/下载页
|
5 years ago |
|
sunke
|
7f169dc211
|
渠道流水计算
|
5 years ago |
|
ELF
|
ed25d54dc8
|
解决冲突
|
5 years ago |
|
ELF
|
501b8099d4
|
解决冲突
|
5 years ago |
|
chenzhi
|
2fe965749e
|
财务汇总ok
|
5 years ago |
|
chenxiaojun
|
b7d2931106
|
管理后台--更新
|
5 years ago |
|
chenxiaojun
|
e9dae29deb
|
管理后台>推广员>推广员管理>推广员列表--新增资质认证
|
5 years ago |
|
chenxiaojun
|
e9581a2e04
|
管理后台>推广员>结算管理>推广提现--更新
|
5 years ago |
|
sunke
|
56981a0acc
|
渠道计算
|
5 years ago |
|
yulingwei
|
2cd5574de7
|
新增审核时间
|
5 years ago |
|
ELF
|
69185016a0
|
修改
|
5 years ago |
|
liuweiwen
|
dfd198e9b7
|
对账系统增加奖罚数据
|
5 years ago |
|
liuweiwen
|
2ba96aa424
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
chenxiaojun
|
2c52bccaf7
|
管理后台>推广员>结算管理>推广提现>自动审核管理--更新
|
5 years ago |
|
liuweiwen
|
2ed47500f0
|
Merge branch 'hotfix/recharge_statistics' into feature/admin_optimize
|
5 years ago |
|
liaojinling
|
e596d11cee
|
会长押金
|
5 years ago |
|
liuweiwen
|
2bffe498bf
|
奖罚记录管理优化
|
5 years ago |
|
zyx
|
0aad9c4735
|
下游结算单生成功能上传
|
5 years ago |
|
jbRotk
|
a6b1194be0
|
解决冲突
|
5 years ago |
|
jbRotk
|
5d315d4182
|
添加工会类型
|
5 years ago |
|
chenzhi
|
1f5944c0a4
|
优化奖罚符号问题
|
5 years ago |
|
chenzhi
|
29618ce878
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
|
5 years ago |
|
chenzhi
|
58eb6a0e12
|
新增cp公司优化奖罚自动获取
|
5 years ago |
|
liuweiwen
|
2b51122d13
|
Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize
|
5 years ago |
|
liuweiwen
|
9e9a925429
|
奖罚记录管理
|
5 years ago |
|
chenxiaojun
|
a7891d6b57
|
管理后台>推广员>结算管理>推广提现--部分功能优化
|
5 years ago |
|
jbRotk
|
72cfd9ec64
|
新增渠道费率
|
5 years ago |
|
zhengchanglong
|
4aeaf8f74c
|
Merge branch 'feature/admin_optimize' into release
|
5 years ago |
|
jbRotk
|
c84cde9567
|
Merge branch 'feature/ylw' into feature/admin_optimize
|
5 years ago |
|
jbRotk
|
5f510cd4d9
|
新增奖惩时间
|
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 |
|
jbRotk
|
35b6d25ebc
|
upt
|
5 years ago |
|
chenxiaojun
|
cbe40d4b0f
|
管理后台更新
|
5 years ago |
|
chenxiaojun
|
f1b454627e
|
管理后台更新
|
5 years ago |
|
chenxiaojun
|
a8008fbe05
|
管理后台>推广员>结算管理>公会分成管理--规则修改
|
5 years ago |
|
chenxiaojun
|
73f1055303
|
管理后台>推广员>结算管理>推广提现--增加自动审核功能
|
5 years ago |
|
zhengchanglong
|
72d222a64a
|
CP分成比例修改
|
5 years ago |
|
chenzhi
|
29868a6331
|
Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize
|
5 years ago |
|
chenzhi
|
158c56d543
|
优化甲方可以自由选择
|
5 years ago |
|
zyx
|
07279467ca
|
管理后台部分限制规则修改 / 开放甲乙方都能为万盟天下后，无法检索出万盟天下
|
5 years ago |
|
chenzhi
|
332ff4c3c4
|
优化生成上游对账单手机及银行卡验证规则
|
5 years ago |
|
chenxiaojun
|
10665cc869
|
管理后台>推广员>结算管理>公会分成管理--更新
|
5 years ago |
sk
|
636aabb5a0
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/add_promote_company
|
5 years ago |
|
zyx
|
d4850b60be
|
Merge branch 'hotfix/testWhiteList' into release
|
5 years ago |
|
zyx
|
2ad5017fae
|
测试白名单编辑修改成删除
|
5 years ago |
|
sk
|
ce9faf7271
|
公司录入
|
5 years ago |
|
jbRotk
|
65461ff200
|
c
|
5 years ago |
|
liuweiwen
|
0fba64c6f1
|
数据展示权限：勾选权限时，*号屏蔽的地方要开放，另没数据权限的地方补上
|
5 years ago |
|
ELF
|
56a97f7eef
|
修改bug
|
5 years ago |
|
ELF
|
e8a0975981
|
解决冲突
|
5 years ago |
|
ELF
|
6993d164a3
|
解决冲突
|
5 years ago |
|
ELF
|
d3a3b8cdb7
|
修改
|
5 years ago |
|
sunke
|
0e0c1798f4
|
推广导入空数据初始化
|
5 years ago |
|
yulingwei
|
ac8d7300ad
|
Merge branch 'feature/game_divide_warn' into dev
|
5 years ago |
|
yulingwei
|
33a19fbb6a
|
upt
|
5 years ago |
|
yulingwei
|
f0109e9554
|
合并请求
|
5 years ago |
|
sunke
|
b9ddc1aafb
|
推广配置
|
5 years ago |
|
zhengchanglong
|
9961448831
|
Merge branch 'release' into dev
|
5 years ago |
|
yulingwei
|
6daf38aa43
|
upt
|
5 years ago |
|
yulingwei
|
dfd274a667
|
Merge branch 'release' into feature/game_divide_warn
|
5 years ago |
|
yulingwei
|
0ebe11027e
|
upt
|
5 years ago |
|
chenzhi
|
56617b1e25
|
Merge branch 'feature/ghcount_change' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
fa784fac8a
|
优化游戏订单导出
|
5 years ago |
|
chenzhi
|
54f2e0abcd
|
游戏统计新增会长和公司
|
5 years ago |
|
zhengyongxing
|
ef41dbfcee
|
下游输出错误修改
|
5 years ago |
|
zhengyongxing
|
561e6bd84c
|
下游输出错误修改
|
5 years ago |
|
sunke
|
d2b7e91a64
|
推广配置
|
5 years ago |
|
liuweiwen
|
490b6a3369
|
工会归属隐藏导出
|
5 years ago |
|
ELF
|
0d45be780f
|
解决冲突
|
5 years ago |
|
chenxiaojun
|
5a75ea406a
|
更新
|
5 years ago |
|
liuweiwen
|
ccca9fb0bd
|
管理后台-》推广员列表可关键内外团搜索
|
5 years ago |
|
yulingwei
|
076b4393eb
|
upt
|
5 years ago |
|
yulingwei
|
aafc877e71
|
merghe
|
5 years ago |
|
yulingwei
|
d33d0c3f46
|
upt
|
5 years ago |
|
chenxiaojun
|
6e05546db6
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
258e10c9d1
|
结算管理--更新
|
5 years ago |
|
zhengyongxing
|
4c42ee90e3
|
市场结算生成下游对账单代码优化
|
5 years ago |
|
liuweiwen
|
ef975943bb
|
针对admin的后台账号对游戏充值和角色查询做完全访问权限，没完全访问权限时必须通过搜索才显示结果
|
5 years ago |
|
zhengyongxing
|
136f565f9f
|
市场结算管理设备类型条件修正
|
5 years ago |
|
yulingwei
|
23f2334e45
|
新增充值权限查看
|
5 years ago |
|
zhengyongxing
|
f86265d38c
|
市场结算管理设备类型条件修正
|
5 years ago |
|
sunke
|
9152a3ef59
|
推广配置导入功能
|
5 years ago |
|
zhengchanglong
|
d054e70c73
|
Merge branch 'release' into dev
# Conflicts:
# Application/Admin/Controller/MemberController.class.php
# Application/Admin/View/Promote/belong_edit.html
|
5 years ago |
|
chenzhi
|
5fdb7946cc
|
新增登陆记录列表统计权限
|
5 years ago |
|
chenzhi
|
4e1567f013
|
新增玩家列表列表及统计权限
|
5 years ago |
|
zhengyongxing
|
16814af0d2
|
市场结算管理总流水弹窗优化
|
5 years ago |
|
zhengyongxing
|
3559d91a32
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
|
zhengyongxing
|
7770fc13c8
|
市场结算管理总流水弹窗优化
|
5 years ago |
|
liuweiwen
|
d1022c85fd
|
Merge remote-tracking branch 'origin/release' into release
|
5 years ago |
|
liuweiwen
|
5a633ccb49
|
工会归属申请时间日期格式化
|
5 years ago |
|
zhengyongxing
|
8cbf3574e3
|
市场结算管理总流水弹窗优化
|
5 years ago |
|
liuweiwen
|
822ec35ff8
|
Merge branch 'feature/group_type' into release
|
5 years ago |
|
liuweiwen
|
2b3099a2d8
|
工会归属会长不可编辑
|
5 years ago |
|
ELF
|
a31e42b7c4
|
Merge branch 'hotfix/link_info' into release
|
5 years ago |
|
ELF
|
b0bc4c0496
|
解决冲突
|
5 years ago |
|
ELF
|
0f44d9e95c
|
解决冲突
|
5 years ago |
|
liuweiwen
|
7431072bbf
|
从dev复制代码
|
5 years ago |
|
chenzhi
|
dff83c73d0
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
33be79e5cf
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
chenzhi
|
f34b71114f
|
优化数字提示
|
5 years ago |
|
zhengyongxing
|
ec027503cc
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
13d1da8733
|
Merge remote-tracking branch 'origin/feature/group_type' into feature/group_type
|
5 years ago |
|
zhengyongxing
|
63b44a78ff
|
下游订单生成bug修正
|
5 years ago |
|
chenzhi
|
fd36d6e674
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
ee5330bfc9
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
e5d8710f0a
|
优化罚款保存后数据不对
|
5 years ago |
|
chenxiaojun
|
02ccf125dc
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
365a276b95
|
公会分成管理--更新
|
5 years ago |
|
zhengyongxing
|
1a52a129f2
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
122a27634b
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
e73d795ace
|
生成下游结算单下拉选项框优化
|
5 years ago |
|
chenzhi
|
ef0b3c86f0
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
liuweiwen
|
6caf99e984
|
对账系统登录界面修改
|
5 years ago |
|
zhengyongxing
|
c09c3a591e
|
结算单bug修正
|
5 years ago |
|
chenzhi
|
b566a2352a
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
chenzhi
|
cdb0b10c9a
|
结算列表新增对账单地址
|
5 years ago |
|
chenzhi
|
fd18ed01fe
|
合并
|
5 years ago |
|
chenzhi
|
dbc0e00132
|
合并
|
5 years ago |
|
chenzhi
|
d889bef13d
|
优化上游时间选择提示
|
5 years ago |
|
chenzhi
|
c3848e5b55
|
优化上游信息提示
|
5 years ago |
|
zhengyongxing
|
8965fe8201
|
Merge branch 'feature/group_type' into dev
# Conflicts:
# Application/Admin/Controller/QueryController.class.php
|
5 years ago |
|
zhengyongxing
|
a2ce005497
|
Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into feature/group_type
|
5 years ago |
|
zhengyongxing
|
71f2d75b8e
|
市场结算管理总流水点击查看各个渠道的流水
|
5 years ago |
|
liuweiwen
|
bbc1b05e1c
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
liuweiwen
|
b8e36847a3
|
cp对账系统退出
|
5 years ago |
|
zhengyongxing
|
a51291216a
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
f36202486d
|
生成上游订单修改
|
5 years ago |
|
zhengyongxing
|
abfc54a0af
|
Merge branch 'feature/group_type' into dev
|
5 years ago |
|
zhengyongxing
|
2f1d5fbd38
|
生成上游订单修改
|
5 years ago |