 ELF
|
dd71ccdf83
|
修改
|
4 years ago |
|
廖金灵
|
648cde1eff
|
Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
推广员信息显示通过权限控制
|
4 years ago |
|
ELF
|
53f3ad6864
|
优化
|
4 years ago |
|
廖金灵
|
38dc6c0c56
|
Merge branch 'hotfix/perm_market_visiable' of wmtx/platform into release
市场专员信息显示通过权限控制
|
4 years ago |
|
ELF
|
dfdc31f4dc
|
市场专员信息显示通过权限控制
|
4 years ago |
zhengyongxing
|
6021f91604
|
公会订单添加所属商户
|
4 years ago |
|
zhengyongxing
|
3f04fa1507
|
公会统计商户名称修改
|
4 years ago |
|
zhengyongxing
|
58ff5ad1ed
|
公会统计--订单详情 新增所属商户展示
|
4 years ago |
|
zhengyongxing
|
0155111706
|
特殊比例申请比例限制提交
|
4 years ago |
张谷诚
|
b642f671c7
|
Merge branch 'hotfix/orderquery' of wmtx/platform into release
|
4 years ago |
tping
|
e6ae117fd7
|
1,隐藏删除按钮（后台->推广->游戏分包）
2,推广后台增加下单时间查询
|
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
|
80b148d6c5
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
859f5b58c9
|
汇总功能还原修正
|
4 years ago |
|
zhengyongxing
|
f450df3265
|
汇总功能修正
|
4 years ago |
|
zhengyongxing
|
54a0fde480
|
汇总公司与上游回退
|
4 years ago |
|
zhengyongxing
|
27c95792ff
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
def69bf6aa
|
外团推广功能修正提交
|
4 years ago |
|
zhengyongxing
|
823e241f2e
|
外团推广功能bug修正
|
4 years ago |
|
zhengyongxing
|
5c497b94dc
|
分成比例导出修正
|
4 years ago |
|
zhengyongxing
|
2dbb4a7940
|
市场部提示语修改
|
4 years ago |
|
zhengyongxing
|
c1b556b0b1
|
市场业绩排序修改
|
4 years ago |
|
zhengyongxing
|
6ac5c1d524
|
比例逻辑修改
|
4 years ago |
|
zhengyongxing
|
0c69c8f662
|
汇总结算结算时间位置修改
|
4 years ago |
|
zhengyongxing
|
40664b5f8d
|
市场业绩功能修改，将不结算毛利以日来统计
|
4 years ago |
|
zhengyongxing
|
ba6323203a
|
模板比例bug修改提交
|
4 years ago |
|
zhengyongxing
|
2848f0ce90
|
外团推广游戏功能高亮显示
|
4 years ago |
|
zhengyongxing
|
2914f9964c
|
汇总编辑结算金额总计添加
|
4 years ago |
|
zhengyongxing
|
f0cbe3cafb
|
周结算金额bug修改
|
4 years ago |
|
zhengyongxing
|
86769746ef
|
外团可申请游戏bug修改
|
4 years ago |
|
zhengyongxing
|
e30cd2fea7
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
5c57abc794
|
历史流水比例修正
|
4 years ago |
|
zhengyongxing
|
f8a7d53ac8
|
外团推广功能提交
|
4 years ago |
|
zhengyongxing
|
a00834e4e5
|
外团推广功能不结算提交
|
4 years ago |
|
zhengyongxing
|
9c49d8bedc
|
外团推广功能提交
|
4 years ago |
|
ELF
|
47ff398bf4
|
修改
|
4 years ago |
|
ELF
|
ffad0d78c5
|
修改
|
4 years ago |
|
ELF
|
62d2eaef72
|
去除商户规则配置删除功能
|
4 years ago |
|
zhengyongxing
|
9bf3c89659
|
特殊比例与模板比例添加流水类型
|
4 years ago |
万盟天下
|
f7bd731ead
|
Merge branch 'feature/testing_resource_admin' of wmtx/platform into master
测试资源功能提交
|
4 years ago |
|
zhengyongxing
|
68ba764d72
|
Merge branch 'hotfix/modify_special_piont' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
6b47baf59a
|
汇总编辑前端修改
|
4 years ago |
|
ELF
|
ae3e49b95f
|
修改
|
4 years ago |
|
ELF
|
f77505925f
|
修改
|
4 years ago |
|
ELF
|
f3771dfd2d
|
修改
|
4 years ago |
|
ELF
|
a10bb888da
|
修改bug
|
4 years ago |
|
zhengyongxing
|
4f35cacbab
|
汇总模板修改提交
|
4 years ago |
|
ELF
|
18c3e95f30
|
修改
|
4 years ago |
|
ELF
|
8e4ba0e20e
|
修改
|
4 years ago |
|
ELF
|
c5fe80639f
|
修改
|
4 years ago |
|
ELF
|
06bd640c79
|
修改
|
4 years ago |
|
ELF
|
263e35c097
|
初步提交
|
4 years ago |
|
廖金灵
|
662efdb613
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合结算单导出bug修正
|
4 years ago |
|
zhengyongxing
|
3f90e1d9ee
|
汇总审批重算状态修正
|
4 years ago |
|
zhengyongxing
|
723b3c9fa2
|
汇总重算提示语修正
|
4 years ago |
|
zhengyongxing
|
e7b64f27f2
|
汇总重算提示语修正
|
4 years ago |
郑永星
|
6cbc8e0102
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合汇总导出bug修改
|
4 years ago |
|
zhengyongxing
|
1f31244d10
|
聚合汇总导出bug修改
|
4 years ago |
|
郑永星
|
37dd11369e
|
Merge branch 'feature/add_item' of wmtx/platform into release
聚合结算单导出bug修正
|
4 years ago |
|
zhengyongxing
|
ac5c1a199c
|
聚合结算单导出bug修正
|
4 years ago |
|
廖金灵
|
a2a9625933
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司汇总公司添加，公司绑定编辑开放
|
4 years ago |
|
郑永星
|
d7edb41f44
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
01df95637a
|
汇总bug修正
|
4 years ago |
|
郑永星
|
b69bc8ef6a
|
Merge branch 'feature/add_item' of wmtx/platform into release
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
3f78880f7d
|
汇总bug修正
|
4 years ago |
chenzhi
|
f311da5208
|
优化银行卡号不限制
|
4 years ago |
|
zyx
|
5bec0ba91c
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
c99cad808c
|
汇总状态的操作修改
|
4 years ago |
|
zyx
|
041006e1b4
|
汇总状态的操作修改
|
4 years ago |
|
zhengyongxing
|
ef0c4427ce
|
Merge branches 'feature/add_item' and 'master' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
4210bb7bf0
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
b4bdcd24fc
|
汇总bug流程修正
|
4 years ago |
|
万盟天下
|
9db2434d10
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合公司绑定流程优化
|
4 years ago |
|
zhengyongxing
|
2b4ed15a30
|
聚合公司绑定流程优化
|
4 years ago |
|
万盟天下
|
1cb13ebb4c
|
Merge branch 'feature/add_item' of wmtx/platform into master
聚合汇总bug修正
|
4 years ago |
|
zhengyongxing
|
a2b085562d
|
聚合汇总bug修正
|
4 years ago |
|
郑永星
|
bdcc9a8e27
|
Merge branch 'hotfix/game_ratio_modify' of wmtx/platform into release
特殊比例bug修正
|
4 years ago |
|
zhengyongxing
|
0dd7bceb3f
|
特殊比例bug修正
|
4 years ago |
|
ELF
|
19c782b053
|
解决冲突
|
4 years ago |
|
zhengyongxing
|
c06e53ab31
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
1e67b1d1a1
|
汇总bug修正
|
4 years ago |
|
zhengyongxing
|
a1ac92dc02
|
押金bug修正
|
4 years ago |
|
ELF
|
268ea4e34d
|
修改
|
4 years ago |
|
zhengyongxing
|
ce0196afea
|
押金bug修正
|
4 years ago |
|
zhengyongxing
|
465f095dc4
|
市场业绩bug修正
|
4 years ago |
|
zhengyongxing
|
5c65f356b2
|
市场业绩开发类型修正
|
4 years ago |
|
zhengyongxing
|
15ad0a902b
|
Merge branches 'feature/add_item' and 'release' of 47.111.118.107:wmtx/platform into feature/add_item
Conflicts:
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
dab8251c11
|
Merge branches 'feature/company_export_change' and 'release' of 47.111.118.107:wmtx/platform into feature/company_export_change
Conflicts:
Application/Admin/Controller/AggregateFinanceStatementController.class.php
Data/update.sql
|
4 years ago |
|
zhengyongxing
|
bc084fa2e1
|
汇总编辑小数点保留两位
|
4 years ago |
|
zhengyongxing
|
a86fab6bf6
|
聚合公司绑定功能修改
|
4 years ago |
|
zhengyongxing
|
984619e310
|
汇总审批撤回bug修改
|
4 years ago |
|
zhengyongxing
|
a19f668687
|
财务汇总功能撤回审批修改
|
4 years ago |
|
zhengyongxing
|
2cdc4e815b
|
下游公司cp比例修改
|
4 years ago |
|
zhengyongxing
|
28f73f3140
|
公司比例格式修改
|
4 years ago |
|
zhengyongxing
|
995a860016
|
汇总编辑功能修改
|
4 years ago |
|
zhengyongxing
|
c366fcfe4e
|
汇总编辑功能提交
|
4 years ago |
|
zhengyongxing
|
825d4e51c9
|
聚合公司绑定功能修改
|
4 years ago |
|
zhengyongxing
|
e8e190a7eb
|
聚合公司绑定功能修改
|
4 years ago |
|
zhengyongxing
|
4e9bde9c10
|
汇总编辑提交
|
4 years ago |
|
zhengyongxing
|
9a6bc50eca
|
聚合公司绑定编辑修改
|
4 years ago |