Commit Graph

2360 Commits (37a84b8ce72513cd6a344c4a22278641c0adbe33)

Author SHA1 Message Date
廖金灵 37a84b8ce7 Merge branch 'feature/company_game_rotio_perm' of wmtx/platform into release
修改推广游戏分成市场专员权限控制
廖金灵 613b50eb63 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
zhengyongxing f18db12d69 支付渠道跳转增加
廖金灵 c8af2d79ff Merge branch 'feature/deposit' of wmtx/platform into release
修改时间问题
廖金灵 a2474aaa0b Merge branch 'feature/reward' of wmtx/platform into release
修改时间
yulingwei b1a91339cb Merge branch 'feature/deposit' of 47.111.118.107:wmtx/platform into feature/deposit
yulingwei 1634f14fb2 upt
yulingwei a01beb9bc6 upt
郑永星 f01030ffaa Merge branch 'hotfix/market_percentage' of wmtx/platform into release
zhengyongxing d9d66dc5bf 支付渠道跳转增加
陈志 575c074c39 Merge branch 'fix/change_statement_time' of wmtx/platform into release
chenzhi b63369cdba 优化结算方式查询
chenzhi c6b3d1948e 优化打款剔除后显示
廖金灵 697dad95c8 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
zhengyongxing 4c582e51c7 支付渠道跳转增加
廖金灵 d6790fdf6c Merge branch 'feature/plateform_statistics' of wmtx/platform into release
修改导出问题
yulingwei 08400bd67a upt
廖金灵 86b8682d02 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付渠道跳转增加
zhengyongxing 0c4f1f05bd 支付渠道跳转增加
廖金灵 fc7284de94 Merge branch 'feature/reward' of wmtx/platform into release
奖罚样式问题
廖金灵 d73ab9c4cd Merge branch 'feature/payment_merchant' of wmtx/platform into release
完善支付商户操作日志
陈志 f63985ece1 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
市场结算管理bug修改
ELF a4d4a51a2c 完善支付商户操作日志
chenzhi 3318298d2e 优化上下游导出时间
zhengyongxing 9a722d5b45 市场结算管理bug修改
yulingwei de0fc5e074 upt
chenzhi 6f75b0e6d8 优化结算单无地址
chenzhi 493197fed2 优化重新结算
chenzhi 91510679b0 Merge branch 'fix/change_compnay_info0729' of 47.111.118.107:wmtx/platform into fix/change_statement_time
chenzhi 853c938edb 优化下游个人结算时间
chenzhi 92ccc96dcd 优化下游公司结算时间审核
chenzhi a14f0abb88 上游新增结算时间判断
廖金灵 57ea4efb72 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
充值订单bug修改
zhengyongxing 8c237e19fe 充值订单bug修改
廖金灵 79f038d62a Merge branch 'hotfix/market_percentage' of wmtx/platform into release
付商户bug修改
zhengyongxing 24bcd381a0 支付商户bug修改
chenzhi 0f284cf9b3 优化游戏绑定,已经绑定不出现
zhengyongxing a960e0a7e4 商户bug修改
zhengyongxing 624a2b7cde 商户bug修改
zhengyongxing 9a202a393e 商户bug修改
zhengyongxing ee5fc4c7c8 Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
 Conflicts:
	Application/Admin/View/Spend/lists.html
zhengyongxing 9670bf86b6 商户bug修改
廖金灵 7340d5b4fd Merge branch 'hotfix/market_percentage' of wmtx/platform into release
手机号码重复验证
zhengyongxing 45d124b4cd 手机号码重复验证
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查询
廖金灵 54ad7191b1 Merge branch 'hotfix/market_percentage' of wmtx/platform into release
聚合公司及增加手机登录功能