Commit Graph

1668 Commits (f4aeae340d6da255018ac292fff38e522a9100b9)

Author SHA1 Message Date
廖金灵 47c565e31c Merge branch 'hotfix/market_percentage' of wmtx/platform into release
下游公司字段与上游公司字段一致
zhengyongxing 57903e8a13 下游公司字段与上游公司字段一致
ELF edb090feca 解决冲突
ELF 004b540a63 解决冲突
ELF 0803b686c3 解决冲突
廖金灵 9e3de695ca Merge branch 'feature/plateform_statistics' of wmtx/platform into release
市场部统计修改
廖金灵 e4ab39bf64 Merge branch 'feature/ip_search' of wmtx/platform into release
IP查询
zhengyongxing ea2683716f 下游公司字段与上游公司字段一致
廖金灵 54ad7191b1 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
聚合公司及增加手机登录功能
廖金灵 949570abf4 Merge branch 'feature/game_agg' of wmtx/platform into release
游戏统计显示聚合数据
ELF e0f71b67c5 处理
zhengyongxing 4f681f7d72 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Data/update.sql
zhengyongxing 09629a12a8 下游公司字段与上游公司字段一致
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 下游公司字段与上游公司字段一致
陈志 e01c7e4e01 Merge branch 'feature/finance_statement723' of wmtx/platform into release
ELF 56282658fc 解决冲突
ELF 0206a422f9 解决冲突
chenzhi fb9deff8b7 优化新增生效的默认时间
chenzhi 0f023bed36 优化结算提示
chenzhi e2bd47ac2d 优化按钮太挤
chenzhi b9604c162a 优化操作时间判断
chenzhi 8de452c8f7 优化名称显示
chenzhi f4be3972b2 优化结算单确认
chenzhi b7409ab069 优化导出
chenzhi eb311348a8 优化检索
chenzhi 4d65542338 优化结算包名文字
chenzhi 2a303cf0f5 优化审核流程
chenzhi 0aac0cfad7 新增结算类型
chenzhi 31b1c771a1 新增全量查看
chenzhi a69b21dd14 汇总单新增周月结审核
chenzhi b0034d5f19 优化推广公司游戏申请不审核
chenzhi a948986b41 优化上游导出
chenzhi 62f2bc350d 优化时间控件
chenzhi 5c857840a2 分成比例新增生效检索
chenzhi 94a3057013 新增游戏分成比例导出
chenzhi ac65098827 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/finance_statement723
廖金灵 5f0917220c Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
推广分成特殊申请
chenzhi 8e4541cb01 推广分成特殊申请
廖金灵 762c93d89e Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
chenzhi b1790a8897 优化手机不限制
廖金灵 c67cbc61c2 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化电话不限制
chenzhi 1e3b1dad66 优化排序
廖金灵 4869d650d9 Merge branch 'feature/cp_juhe_company' of wmtx/platform into release
时间格式修正,导出格式修改
zhengyongxing 815e2e3b88 时间格式修正,导出格式修改
chenzhi 6024ae342c 优化顺序及导出
zhengyongxing 08e221a53c 商户专员隐藏
chenzhi 8ded1f3169 优化游戏模板显示
chenzhi 4460f8e7cf 新增结算包名
chenzhi 3ff79ce6c1 优化公会检索
chenzhi 832f531d20 优化审核通过
ELF 557f0203ac 解决冲突
廖金灵 5d809ae9b8 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
优化合同期限查询
chenzhi eaa6762935 优化模板错误
ELF 62d7f15fdc Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_landing_assign
zhengyongxing 68f8bb1ce0 聚合公司详情详细地址修改
chenzhi 3ad0d447d4 优化显示
chenzhi 5a962e1b73 新增分成优化
zhengyongxing 26f13922a1 聚合公司时间修正
chenzhi 0237e0ff63 优化导出
chenzhi 6181059faf 优化搜索
chenzhi 10e56211ce 优化导出提示
chenzhi 1ec951d344 优化空值显示
chenzhi 61e6d8131c 新增支付宝真实名称只能是中文验证
chenzhi f66bce14b2 优化下游列表显示及导出
chenzhi d015bce440 优化推广下游查看
chenzhi 80e8477b51 新增检索
chenzhi a3f28b67a5 新增游戏搜索
zhengyongxing 2fe7c864df 聚合公司功能提交
zhengyongxing 420723f593 商户充值汇总更改名称
zhengyongxing 4c3112b70e 充值信息查看权限添加
zhengyongxing 837358f86b 支付商户统计字段展示修改
chenzhi d91d8346b9 优化下游导出
ELF 27ccee9b20 修改
yulingwei 6c23a3ee52 upt
yulingwei 9a380d7756 upt
chenzhi 8ac604be33 优化导出
chenzhi 6bb398bcc3 优化下游显示
yulingwei 7b9bb91e16 upt
zhengyongxing a09da4a184 聚合下游公司列表导出修正
zhengyongxing 1ff82cce20 聚合下游公司列表添加
chenzhi 5367ea4aae 优化前端
ELF f3b323bda8 修改
yulingwei e5996b47cc upt
yulingwei 0a9e7ed3ef upt
yulingwei e789c941ed upt
yulingwei 7830cef93d upt
chenzhi bffbd6a2b1 优化ok
chenzhi 2619e598e8 合并marster
chenzhi 22a65f8404 优化下游支付宝导出
yulingwei e0d74cbffd upt
yulingwei 066610f236 upt
yulingwei 877a53e892 upt
yulingwei f373bd2025 upt
yulingwei deac7da5ff upt
yulingwei 25dec010be upt
yulingwei 28a44019e4 upt
yulingwei eaa25ebcda feature/desposit
zhengyongxing cacb1e4cf4 商户统计结算功能添加
ELF 096e32d581 商户配置
yulingwei 2fbea72d26 up
chenzhi b4c6f4316a 优化显示
chenzhi afac0376be 新增下游审批
chenzhi 7d404c6904 优化查看
chenzhi cafdc39f2a 优化添加
chenzhi d662c89b7e zancun
zhengyongxing 960903a31c 新功能添加
chenzhi f731a417bd 优化工会关系
chenzhi d9d55a3bcb 优化新增下游公司
zhengyongxing 1abaa7c646 支付渠道名称修改
ELF e8a925b64c 游戏统计添加聚合充值数据
chenzhi 69adcbabf8 优化推广公司
chenzhi 5aa7427504 新增公司信息编辑
chenzhi c708fb6d11 优化CP搜索
yulingwei dda43c7289 Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit
yulingwei 555fd052fe upt
chenzhi 35f2fe3f05 优化公司显示
yulingwei e337ecac5e upt
yulingwei c8bd476a60 upt
chenzhi f7d90780aa 新增CP公司审核
chenzhi 33cf2cf8a6 新增审核列表
yulingwei adc3acd992 upt
yulingwei 33049f5a9f upt
chenzhi 0c2e2db65d 新增税费费率
zhengyongxing 288f121955 添加手机登录的功能
yulingwei e155c92ed6 1
zhengyongxing 114e51ebe2 Merge branch 'master' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
chenzhi 58c8508ce4 新增cp导出
ELF c87b61d94b 修改发票类型
ELF 0f0d52c78f 修改
ELF b448f0829e 修改公司绑定默认值
yulingwei 98413791aa repair
ELF 15d0b454a4 修改
万盟天下 72115a9ede Merge branch 'feature/promote_statistics' of wmtx/platform into release
推广员统计修改
yulingwei 6390d680ec upt
zhengyongxing 2220a6cfec 财务支付时间修改,增加手机登录验证,及开发推广员列表名称
yulingwei 51a1c9c707 upt
yulingwei b9dfe08177 upt
yulingwei 1119e8faf9 upt
chenzhi 2f9269f29f 取消默认选择时间
yulingwei 80597c4894 upt
yulingwei 5e5aa8ca3f upt
yulingwei 0b54c71cb0 upt
chenzhi d6ec8e0248 新增导出
廖金灵 420c3454fc Merge branch 'hotfix/fan_promote' of wmtx/platform into master
优化公会统计
廖金灵 3095270a84 Merge branch 'hotfix/fan_promote' of wmtx/platform into release
修改工会统计
ELF f167d63c4a 修改
zhengyongxing 039b496b28 市场专员筛选,月份跳转,及时间筛选修正
zhengyongxing 96f68c4f50 市场专员筛选,月份跳转,及时间筛选修正
廖金灵 98dab102f4 Merge branch 'feature/market_percentage' of wmtx/platform into release
跳转汇总结算单跳转修正,添加筛选发放状态的代码