Commit Graph

4754 Commits (35f2fe3f05d47d3eb54469657682c24d85663c5e)

Author SHA1 Message Date
zhengyongxing 2fae4219df 公会统计去除
zhengyongxing a8f4f16349 Merge branch 'feature/juhe_sms' into feature/platfrom_aggregate_finance
# Conflicts:
#	Application/Admin/View/PromoteCompany/view.html
#	Data/update.sql
ELF e3b53e7df1 修改
ELF 73f5f4f5ea 修改
ELF 38c10a0f7a 修改
ELF 10aed50db7 修改
ELF f9b054e1cb 修改
ELF 34691d6baa 修改
ELF f0a8b6bc3b 修改
ELF 6f2f588617 优化
yulingwei 2680f92079 1
yulingwei 4058eb3963 1
ELF 76fcfec7c2 修改
yulingwei 22ac6bf293 修复问题
ELF 5f5a6ee1af 修改
廖金灵 c1163e7b22 Merge branch 'release' of wmtx/platform into master
版本更新2020.06.24
廖金灵 4989deb7be Merge branch 'feature/loginInfo' of wmtx/platform into release
验证码提示样式修改
yulingwei efe84158da 修改错误样式
zhengyongxing c3956f7ed2 平台币金额解释添加
廖金灵 bc00b1112f Merge branch 'feature/apply_game' of wmtx/platform into release
task440
廖金灵 1907985e7b Merge branch 'feature/ylw-06-10' of wmtx/platform into release
新增公司选择默认模板
廖金灵 2fe024f696 Merge branch 'feature/loginInfo' of wmtx/platform into release
新增手机号限制
yulingwei ff9b2249b8 新增公司默认选择默认模板
yulingwei 34df4e5a8e upt
廖金灵 db32f11215 Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release
取消测试的虚拟验证码
chenzhi 7d8dca7421 取消测试的虚拟验证码
chenzhi 95d9f45612 新增检索
廖金灵 a808b86865 Merge branch 'feature/paytime_summary' of wmtx/platform into release
汇付宝
廖金灵 20b401fe85 Merge branch 'feature/promote_withdraw' of wmtx/platform into release
结算中心提现总金额等4个功能隐藏
zhengyongxing bdc5d3a385 结算中心提现总金额等4个功能隐藏
yulingwei c8924779c4 Merge branch 'release' into feature/ylw-06-17
yulingwei 8c18f2aa1d 1
廖金灵 c4ec5753f0 Merge branch 'feature/loginInfo' of wmtx/platform into release
手机验证码登录推广后台
ELF 2d872ed710 解决冲突
ELF 2589806e62 解决冲突
yulingwei 3f4406a1ee Merge branch 'release' into feature/ylw-06-17
yulingwei 0decb03cb1 merge
ELF a153fb9a0e 修改
chenzhi ad801a37fb 优化前端
yulingwei b2b28bce07 upt
yulingwei 5b604ab073 upt
yulingwei cdf2d903cd upt
chenzhi ca551b9c50 己方公司新增搜索项目
chenzhi e0b588be11 新加加载load
chenzhi c335c1f0b3 优化补点和月结集合
chenzhi bffc9a32f1 数据迁移
chenzhi 26ccc9c450 优化导出权限
yulingwei e4a29b8bb4 upt
chenzhi b8610e3490 永星-优化提现提醒
chenzhi 2229e16a9d 永星-优化前端请求
chenzhi a629654ccb 优化打款
chenzhi 42dc519712 永星-打款中
chenzhi 1da5da1ea5 永星-优化提现说明
chenzhi e96c6e8b52 公司获取优化
chenzhi 40940b4536 优化比例
chenzhi d2a10e626d 永星-优化提现
chenzhi f321c6259d 永星合并
zhengyongxing 0c4b96dd56 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
zhengyongxing 846264600e Merge branch 'feature/promote_withdraw' into feature/platfrom_aggregate_finance
zhengyongxing 5957ffddcf 汇总单代码提交
chenzhi 511f53e83c 优化权限
yulingwei bd166bb5eb upt
chenzhi c422b84df4 Merge branch 'feature/platfrom_aggregate_finance' of 47.111.118.107:wmtx/platform into feature/platfrom_aggregate_finance
chenzhi d845ab35a3 优化新增结算
zhengyongxing 7c0294bb4c Merge branch 'feature/promote_withdraw' into feature/platfrom_aggregate_finance
zhengyongxing b6026f1b32 汇总单代码提交
zhengyongxing 25ae6a03a4 Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
zhengyongxing 6a46df5a28 汇总单代码提交
chenzhi 4b29d159e1 取消备注
zhengyongxing b664ba46ad 汇总单代码提交
chenzhi 6c05756415 新增排序
chenzhi 9d8ed80fcc 优化新增重算
chenzhi 53b9513935 新增结算
chenzhi 53004adf5d 新增打款
chenzhi a2454e0446 取消结算单下游个人导出
zhengyongxing 61d12c2750 汇总单结算代码上传
zhengyongxing 9d43914b17 汇总单结算代码上传
chenzhi 0ba02069a0 优化补点计算方式
chenzhi ec641257b0 优化下游渠道结算
chenzhi fdccc92c43 新增只支持脚本访问
chenzhi 38ab488cd0 修复搜索错误
chenzhi 036a710f2f 修复不修改不重审
chenzhi a9723597f0 优化推广比例未修改重审
zhengyongxing f7f862fd83 官方渠道修改江息网络
yulingwei e09296d10d upt
chenzhi 265384f2c8 优化审核乱跳
chenzhi 994ee29b1d 优化审核列表乱跳
chenzhi 261e63b898 取消未结算的导出
chenzhi ffb60d80a9 修复多家公司合作问题
chenzhi 701c421d0c 上级改为通知成功
chenzhi 0312c1bc75 修复常见bug
chenzhi b28231d12f 优化己方公司返回
chenzhi 31ef129b2d 修复己方公司不能删除
chenzhi ffee256f93 优化bug1
chenzhi fb0edbe752 新增支付备注
chenzhi d5aeb21b33 新增结算周期读取
chenzhi 553d9b0f91 新增分成生效模板
chenzhi 891f2b6a7f 新增首页跳转
chenzhi af1829c124 新增打款详情
yulingwei 99fcc4cbbb upt