Commit Graph

5673 Commits (11ff884e6a71749c0d2bc5ed943da6867dd1daf1)
 

Author SHA1 Message Date
zhengyongxing 11ff884e6a Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/AggregateFinanceSetController.class.php
#	Application/Admin/Controller/CpJuheCompanyController.class.php
#	Application/Admin/View/CpJuheCompany/detail.html
#	Application/Admin/View/CpJuheCompany/export.html
#	Data/update.sql
zhengyongxing 91178308f9 下游公司字段与上游公司字段一致
zhengyongxing 815e2e3b88 时间格式修正,导出格式修改
zhengyongxing 08e221a53c 商户专员隐藏
zhengyongxing 52fe6d04f8 聚合公司详情详细网址修改
zhengyongxing 4325ed23ee 聚合公司详情详细网址修改
zhengyongxing 5bbdfe7e74 聚合公司详情详细地址修改
zhengyongxing 68f8bb1ce0 聚合公司详情详细地址修改
zhengyongxing 26f13922a1 聚合公司时间修正
zhengyongxing 1fff2e6c09 财务代码搬到新的分支上
zhengyongxing 341fa19b6f 聚合公司功能提交
zhengyongxing 2fe7c864df 聚合公司功能提交
zhengyongxing 420723f593 商户充值汇总更改名称
zhengyongxing 4c3112b70e 充值信息查看权限添加
zhengyongxing 837358f86b 支付商户统计字段展示修改
zhengyongxing a09da4a184 聚合下游公司列表导出修正
zhengyongxing 1ff82cce20 聚合下游公司列表添加
zhengyongxing cacb1e4cf4 商户统计结算功能添加
zhengyongxing cb0ceda1cb 聚合财务导出模板修正
zhengyongxing 960903a31c 新功能添加
zhengyongxing 1abaa7c646 支付渠道名称修改
zhengyongxing 729136a95c 聚合订单代码导出,及重算功能修改
zhengyongxing 2fefd44d0c 公会统计推广员支付时间修正
zhengyongxing cd8f64c7e6 游戏详情订单修改
zhengyongxing 70f31ea8a2 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
zhengyongxing 288f121955 添加手机登录的功能
zhengyongxing 114e51ebe2 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
万盟天下 4892623897 Merge branch 'hotfix/exali2020' of wmtx/platform into master
打款账号更新
万盟天下 2528313ba0 Merge branch 'hotfix/promote_achievement' of wmtx/platform into master
修改推广员业绩查询默认值
万盟天下 4d8af10472 Merge branch 'hotfix/update_compony_bind' of wmtx/platform into master
修改公司绑定默认值
张谷诚 6840b58283 Merge branch 'hotfix/exali2020' of wmtx/platform into release
打开账号切换
tping 28c957298a 打开账号更新
万盟天下 5152969467 Merge branch 'hotfix/promote_achievement' of wmtx/platform into release
推广员业绩时间限制提示修改
ELF aeade79e67 修改
万盟天下 870db99102 Merge branch 'hotfix/promote_achievement' of wmtx/platform into release
推广员业绩查询时间范围限制为31天
ELF 80cb58cdc9 推广员业绩查询时间范围限制为31天
万盟天下 b220be63fb Merge branch 'hotfix/update_compony_bind' of wmtx/platform into release
修改发票类型
ELF c87b61d94b 修改发票类型
万盟天下 be821a8e95 Merge branch 'hotfix/update_compony_bind' of wmtx/platform into release
修改bug
ELF 0f0d52c78f 修改
万盟天下 a5985babae Merge branch 'hotfix/update_compony_bind' of wmtx/platform into release
修改公司绑定默认值
ELF eb06f7360c Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/update_compony_bind
ELF b448f0829e 修改公司绑定默认值
廖金灵 80e89c651a Merge branch 'feature/excel_payment' of wmtx/platform into master
优化手机设置
廖金灵 5b7b7c794c Merge branch 'feature/excel_payment' of wmtx/platform into release
优化手机设置
chenzhi ad2078cfbe 优化手机设置
万盟天下 32d4450e4a Merge branch 'featurn/markets' of wmtx/platform into master
名字增加修改
zhengyongxing 53f490ea20 名字增加修改
万盟天下 00d99897b0 Merge branch 'hotfix/gitbag_op' of wmtx/platform into master
优化后台礼包
万盟天下 ac38d018e5 Merge branch 'hotfix/gitbag_op' of wmtx/platform into release
优化后台礼包